Merge pull request #548 from blackberry-gaming/next-setaylor

Fixed xcode project and android makefils for additional lua changes.

gameplay/android/jni/Android.mk

@@ -142,7 +142,6 @@ LOCAL_SRC_FILES := \
     lua/lua_FileSystem.cpp \
     lua/lua_FlowLayout.cpp \
     lua/lua_Font.cpp \
-    lua/lua_FontGlyph.cpp \
     lua/lua_FontJustify.cpp \
     lua/lua_FontStyle.cpp \
     lua/lua_FontText.cpp \
@@ -226,7 +225,6 @@ LOCAL_SRC_FILES := \
     lua/lua_RenderTarget.cpp \
     lua/lua_Scene.cpp \
     lua/lua_SceneDebugFlags.cpp \
-    lua/lua_SceneLoader.cpp \
     lua/lua_ScreenDisplayer.cpp \
     lua/lua_ScriptController.cpp \
     lua/lua_Slider.cpp \

gameplay/gameplay.xcodeproj/project.pbxproj

@@ -140,10 +140,6 @@
 		42B7002B15B08108002BB8C3 /* lua_Font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FEB815B08108002BB8C3 /* lua_Font.cpp */; };
 		42B7002C15B08108002BB8C3 /* lua_Font.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FEB915B08108002BB8C3 /* lua_Font.h */; };
 		42B7002D15B08108002BB8C3 /* lua_Font.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FEB915B08108002BB8C3 /* lua_Font.h */; };
-		42B7002E15B08108002BB8C3 /* lua_FontGlyph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FEBA15B08108002BB8C3 /* lua_FontGlyph.cpp */; };
-		42B7002F15B08108002BB8C3 /* lua_FontGlyph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FEBA15B08108002BB8C3 /* lua_FontGlyph.cpp */; };
-		42B7003015B08108002BB8C3 /* lua_FontGlyph.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FEBB15B08108002BB8C3 /* lua_FontGlyph.h */; };
-		42B7003115B08108002BB8C3 /* lua_FontGlyph.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FEBB15B08108002BB8C3 /* lua_FontGlyph.h */; };
 		42B7003215B08108002BB8C3 /* lua_FontJustify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FEBC15B08108002BB8C3 /* lua_FontJustify.cpp */; };
 		42B7003315B08108002BB8C3 /* lua_FontJustify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FEBC15B08108002BB8C3 /* lua_FontJustify.cpp */; };
 		42B7003415B08108002BB8C3 /* lua_FontJustify.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FEBD15B08108002BB8C3 /* lua_FontJustify.h */; };
@@ -476,10 +472,6 @@
 		42B7017B15B08109002BB8C3 /* lua_SceneDebugFlags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FF6015B08108002BB8C3 /* lua_SceneDebugFlags.cpp */; };
 		42B7017C15B08109002BB8C3 /* lua_SceneDebugFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FF6115B08108002BB8C3 /* lua_SceneDebugFlags.h */; };
 		42B7017D15B08109002BB8C3 /* lua_SceneDebugFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FF6115B08108002BB8C3 /* lua_SceneDebugFlags.h */; };
-		42B7017E15B08109002BB8C3 /* lua_SceneLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FF6215B08108002BB8C3 /* lua_SceneLoader.cpp */; };
-		42B7017F15B08109002BB8C3 /* lua_SceneLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FF6215B08108002BB8C3 /* lua_SceneLoader.cpp */; };
-		42B7018015B08109002BB8C3 /* lua_SceneLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FF6315B08108002BB8C3 /* lua_SceneLoader.h */; };
-		42B7018115B08109002BB8C3 /* lua_SceneLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FF6315B08108002BB8C3 /* lua_SceneLoader.h */; };
 		42B7018215B08109002BB8C3 /* lua_ScreenDisplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FF6415B08108002BB8C3 /* lua_ScreenDisplayer.cpp */; };
 		42B7018315B08109002BB8C3 /* lua_ScreenDisplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42B7FF6415B08108002BB8C3 /* lua_ScreenDisplayer.cpp */; };
 		42B7018415B08109002BB8C3 /* lua_ScreenDisplayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 42B7FF6515B08108002BB8C3 /* lua_ScreenDisplayer.h */; };
@@ -1190,8 +1182,6 @@
 		42B7FEB715B08108002BB8C3 /* lua_FlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_FlowLayout.h; path = src/lua/lua_FlowLayout.h; sourceTree = SOURCE_ROOT; };
 		42B7FEB815B08108002BB8C3 /* lua_Font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_Font.cpp; path = src/lua/lua_Font.cpp; sourceTree = SOURCE_ROOT; };
 		42B7FEB915B08108002BB8C3 /* lua_Font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_Font.h; path = src/lua/lua_Font.h; sourceTree = SOURCE_ROOT; };
-		42B7FEBA15B08108002BB8C3 /* lua_FontGlyph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_FontGlyph.cpp; path = src/lua/lua_FontGlyph.cpp; sourceTree = SOURCE_ROOT; };
-		42B7FEBB15B08108002BB8C3 /* lua_FontGlyph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_FontGlyph.h; path = src/lua/lua_FontGlyph.h; sourceTree = SOURCE_ROOT; };
 		42B7FEBC15B08108002BB8C3 /* lua_FontJustify.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_FontJustify.cpp; path = src/lua/lua_FontJustify.cpp; sourceTree = SOURCE_ROOT; };
 		42B7FEBD15B08108002BB8C3 /* lua_FontJustify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_FontJustify.h; path = src/lua/lua_FontJustify.h; sourceTree = SOURCE_ROOT; };
 		42B7FEBE15B08108002BB8C3 /* lua_FontStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_FontStyle.cpp; path = src/lua/lua_FontStyle.cpp; sourceTree = SOURCE_ROOT; };
@@ -1358,8 +1348,6 @@
 		42B7FF5F15B08108002BB8C3 /* lua_Scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_Scene.h; path = src/lua/lua_Scene.h; sourceTree = SOURCE_ROOT; };
 		42B7FF6015B08108002BB8C3 /* lua_SceneDebugFlags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_SceneDebugFlags.cpp; path = src/lua/lua_SceneDebugFlags.cpp; sourceTree = SOURCE_ROOT; };
 		42B7FF6115B08108002BB8C3 /* lua_SceneDebugFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_SceneDebugFlags.h; path = src/lua/lua_SceneDebugFlags.h; sourceTree = SOURCE_ROOT; };
-		42B7FF6215B08108002BB8C3 /* lua_SceneLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_SceneLoader.cpp; path = src/lua/lua_SceneLoader.cpp; sourceTree = SOURCE_ROOT; };
-		42B7FF6315B08108002BB8C3 /* lua_SceneLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_SceneLoader.h; path = src/lua/lua_SceneLoader.h; sourceTree = SOURCE_ROOT; };
 		42B7FF6415B08108002BB8C3 /* lua_ScreenDisplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_ScreenDisplayer.cpp; path = src/lua/lua_ScreenDisplayer.cpp; sourceTree = SOURCE_ROOT; };
 		42B7FF6515B08108002BB8C3 /* lua_ScreenDisplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_ScreenDisplayer.h; path = src/lua/lua_ScreenDisplayer.h; sourceTree = SOURCE_ROOT; };
 		42B7FF6615B08108002BB8C3 /* lua_ScriptController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_ScriptController.cpp; path = src/lua/lua_ScriptController.cpp; sourceTree = SOURCE_ROOT; };
@@ -2027,8 +2015,6 @@
 				42B7FEB715B08108002BB8C3 /* lua_FlowLayout.h */,
 				42B7FEB815B08108002BB8C3 /* lua_Font.cpp */,
 				42B7FEB915B08108002BB8C3 /* lua_Font.h */,
-				42B7FEBA15B08108002BB8C3 /* lua_FontGlyph.cpp */,
-				42B7FEBB15B08108002BB8C3 /* lua_FontGlyph.h */,
 				42B7FEBC15B08108002BB8C3 /* lua_FontJustify.cpp */,
 				42B7FEBD15B08108002BB8C3 /* lua_FontJustify.h */,
 				42B7FEBE15B08108002BB8C3 /* lua_FontStyle.cpp */,
@@ -2195,8 +2181,6 @@
 				42B7FF5F15B08108002BB8C3 /* lua_Scene.h */,
 				42B7FF6015B08108002BB8C3 /* lua_SceneDebugFlags.cpp */,
 				42B7FF6115B08108002BB8C3 /* lua_SceneDebugFlags.h */,
-				42B7FF6215B08108002BB8C3 /* lua_SceneLoader.cpp */,
-				42B7FF6315B08108002BB8C3 /* lua_SceneLoader.h */,
 				42B7FF6415B08108002BB8C3 /* lua_ScreenDisplayer.cpp */,
 				42B7FF6515B08108002BB8C3 /* lua_ScreenDisplayer.h */,
 				42B7FF6615B08108002BB8C3 /* lua_ScriptController.cpp */,
@@ -2463,7 +2447,6 @@
 				42B7002415B08108002BB8C3 /* lua_FileSystem.h in Headers */,
 				42B7002815B08108002BB8C3 /* lua_FlowLayout.h in Headers */,
 				42B7002C15B08108002BB8C3 /* lua_Font.h in Headers */,
-				42B7003015B08108002BB8C3 /* lua_FontGlyph.h in Headers */,
 				42B7003415B08108002BB8C3 /* lua_FontJustify.h in Headers */,
 				42B7003815B08108002BB8C3 /* lua_FontStyle.h in Headers */,
 				42B7003C15B08108002BB8C3 /* lua_FontText.h in Headers */,
@@ -2547,7 +2530,6 @@
 				42B7017415B08109002BB8C3 /* lua_RenderTarget.h in Headers */,
 				42B7017815B08109002BB8C3 /* lua_Scene.h in Headers */,
 				42B7017C15B08109002BB8C3 /* lua_SceneDebugFlags.h in Headers */,
-				42B7018015B08109002BB8C3 /* lua_SceneLoader.h in Headers */,
 				42B7018415B08109002BB8C3 /* lua_ScreenDisplayer.h in Headers */,
 				42B7018815B08109002BB8C3 /* lua_ScriptController.h in Headers */,
 				42B7018C15B08109002BB8C3 /* lua_Slider.h in Headers */,
@@ -2727,7 +2709,6 @@
 				42B7002515B08108002BB8C3 /* lua_FileSystem.h in Headers */,
 				42B7002915B08108002BB8C3 /* lua_FlowLayout.h in Headers */,
 				42B7002D15B08108002BB8C3 /* lua_Font.h in Headers */,
-				42B7003115B08108002BB8C3 /* lua_FontGlyph.h in Headers */,
 				42B7003515B08108002BB8C3 /* lua_FontJustify.h in Headers */,
 				42B7003915B08108002BB8C3 /* lua_FontStyle.h in Headers */,
 				42B7003D15B08108002BB8C3 /* lua_FontText.h in Headers */,
@@ -2811,7 +2792,6 @@
 				42B7017515B08109002BB8C3 /* lua_RenderTarget.h in Headers */,
 				42B7017915B08109002BB8C3 /* lua_Scene.h in Headers */,
 				42B7017D15B08109002BB8C3 /* lua_SceneDebugFlags.h in Headers */,
-				42B7018115B08109002BB8C3 /* lua_SceneLoader.h in Headers */,
 				42B7018515B08109002BB8C3 /* lua_ScreenDisplayer.h in Headers */,
 				42B7018915B08109002BB8C3 /* lua_ScriptController.h in Headers */,
 				42B7018D15B08109002BB8C3 /* lua_Slider.h in Headers */,
@@ -3050,7 +3030,6 @@
 				42B7002215B08108002BB8C3 /* lua_FileSystem.cpp in Sources */,
 				42B7002615B08108002BB8C3 /* lua_FlowLayout.cpp in Sources */,
 				42B7002A15B08108002BB8C3 /* lua_Font.cpp in Sources */,
-				42B7002E15B08108002BB8C3 /* lua_FontGlyph.cpp in Sources */,
 				42B7003215B08108002BB8C3 /* lua_FontJustify.cpp in Sources */,
 				42B7003615B08108002BB8C3 /* lua_FontStyle.cpp in Sources */,
 				42B7003A15B08108002BB8C3 /* lua_FontText.cpp in Sources */,
@@ -3134,7 +3113,6 @@
 				42B7017215B08109002BB8C3 /* lua_RenderTarget.cpp in Sources */,
 				42B7017615B08109002BB8C3 /* lua_Scene.cpp in Sources */,
 				42B7017A15B08109002BB8C3 /* lua_SceneDebugFlags.cpp in Sources */,
-				42B7017E15B08109002BB8C3 /* lua_SceneLoader.cpp in Sources */,
 				42B7018215B08109002BB8C3 /* lua_ScreenDisplayer.cpp in Sources */,
 				42B7018615B08109002BB8C3 /* lua_ScriptController.cpp in Sources */,
 				42B7018A15B08109002BB8C3 /* lua_Slider.cpp in Sources */,
@@ -3309,7 +3287,6 @@
 				42B7002315B08108002BB8C3 /* lua_FileSystem.cpp in Sources */,
 				42B7002715B08108002BB8C3 /* lua_FlowLayout.cpp in Sources */,
 				42B7002B15B08108002BB8C3 /* lua_Font.cpp in Sources */,
-				42B7002F15B08108002BB8C3 /* lua_FontGlyph.cpp in Sources */,
 				42B7003315B08108002BB8C3 /* lua_FontJustify.cpp in Sources */,
 				42B7003715B08108002BB8C3 /* lua_FontStyle.cpp in Sources */,
 				42B7003B15B08108002BB8C3 /* lua_FontText.cpp in Sources */,
@@ -3393,7 +3370,6 @@
 				42B7017315B08109002BB8C3 /* lua_RenderTarget.cpp in Sources */,
 				42B7017715B08109002BB8C3 /* lua_Scene.cpp in Sources */,
 				42B7017B15B08109002BB8C3 /* lua_SceneDebugFlags.cpp in Sources */,
-				42B7017F15B08109002BB8C3 /* lua_SceneLoader.cpp in Sources */,
 				42B7018315B08109002BB8C3 /* lua_ScreenDisplayer.cpp in Sources */,
 				42B7018715B08109002BB8C3 /* lua_ScriptController.cpp in Sources */,
 				42B7018B15B08109002BB8C3 /* lua_Slider.cpp in Sources */,
@@ -3588,7 +3564,7 @@
 					"\"$(SRCROOT)/../external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
 					"\"$(SRCROOT)/../external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
 					"\"$(SRCROOT)/../external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
-					"\"$(SRCROOT)/../external-deps/lua/lib/ios/armv7\"",
+					"\"$(SRCROOT)/../external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;