From a986f5e82538718eb1487b9db57129aee8d3984c Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 1 Jan 2017 12:13:17 -0400 Subject: [PATCH] Fix iOS build --HG-- branch : minor --- platform/xcode/liblove.xcodeproj/project.pbxproj | 2 ++ src/common/runtime.h | 8 ++++---- src/common/types.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index c17790d2e..a16154e27 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -836,6 +836,7 @@ FA1557C31CE90BD200AFF582 /* EXRHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1557C11CE90BD200AFF582 /* EXRHandler.cpp */; }; FA1557C41CE90BD200AFF582 /* EXRHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = FA1557C21CE90BD200AFF582 /* EXRHandler.h */; }; FA1557C51CE90BD900AFF582 /* EXRHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1557C11CE90BD200AFF582 /* EXRHandler.cpp */; }; + FA1583E21E196180005E603B /* wrap_Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA1BA0B51E17043400AA2803 /* wrap_Shader.cpp */; }; FA19C4C51B4B0BD50059B0B3 /* wrap_Video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA19C4C21B4B0BD50059B0B3 /* wrap_Video.cpp */; }; FA19C4C61B4B0BD50059B0B3 /* wrap_Video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA19C4C21B4B0BD50059B0B3 /* wrap_Video.cpp */; }; FA19C4C71B4B0BD50059B0B3 /* wrap_Video.h in Headers */ = {isa = PBXBuildFile; fileRef = FA19C4C31B4B0BD50059B0B3 /* wrap_Video.h */; }; @@ -3696,6 +3697,7 @@ FA0B7CDA1A95902C000E1D17 /* Pool.cpp in Sources */, FA0B7E161A95902C000E1D17 /* Joint.cpp in Sources */, FA0B7EE91A95902D000E1D17 /* wrap_Window.cpp in Sources */, + FA1583E21E196180005E603B /* wrap_Shader.cpp in Sources */, FA0B7AB91A958EA3000E1D17 /* enet.cpp in Sources */, FA0B7E281A95902C000E1D17 /* PulleyJoint.cpp in Sources */, FA0B7A4C1A958EA3000E1D17 /* b2BlockAllocator.cpp in Sources */, diff --git a/src/common/runtime.h b/src/common/runtime.h index 1c9debc61..a5b81cb8e 100644 --- a/src/common/runtime.h +++ b/src/common/runtime.h @@ -451,7 +451,7 @@ extern "C" { // Called by enet and luasocket * @param type The type bit. **/ template -T *luax_checktype(lua_State *L, int idx, love::Type &type) +T *luax_checktype(lua_State *L, int idx, const love::Type &type) { if (lua_type(L, idx) != LUA_TUSERDATA) { @@ -480,7 +480,7 @@ T *luax_checktype(lua_State *L, int idx) } template -T *luax_getmodule(lua_State *L, love::Type &type) +T *luax_getmodule(lua_State *L, const love::Type &type) { const char *name = type.getName(); @@ -507,7 +507,7 @@ T *luax_getmodule(lua_State *L) } template -T *luax_optmodule(lua_State *L, love::Type &type) +T *luax_optmodule(lua_State *L, const love::Type &type) { const char *name = type.getName(); @@ -545,7 +545,7 @@ T *luax_optmodule(lua_State *L) * @param type The type of the object. **/ template -T *luax_totype(lua_State *L, int idx, love::Type& /*type*/) +T *luax_totype(lua_State *L, int idx, const love::Type& /*type*/) { T *o = (T *)(((Proxy *)lua_touserdata(L, idx))->object); diff --git a/src/common/types.h b/src/common/types.h index 7c20071fd..9f5722c92 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -51,7 +51,7 @@ public: return bits[other]; } - bool isa(Type &other) + bool isa(const Type &other) { if (!inited) init();