Merge branch 'next' of https://github.com/blackberry/GamePlay into next

gameplay-template/gameplay-template.xcodeproj/project.pbxproj

@@ -8,8 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		42438B531491AD2000D218B8 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42438B521491AD2000D218B8 /* libgameplay.a */; };
-		428F7BDE15CB131A009ED24C /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 428F7BDD15CB131A009ED24C /* game.config */; };
 		424CC03C161FCBDD00577827 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424CC03B161FCBDD00577827 /* IOKit.framework */; };
+		428F7BDE15CB131A009ED24C /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 428F7BDD15CB131A009ED24C /* game.config */; };
 		42C932C11491A0DB0098216A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C932C01491A0DB0098216A /* Cocoa.framework */; };
 		42C932EE1491A4CB0098216A /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42C932ED1491A4CB0098216A /* icon.png */; };
 		42C932F11491A5160098216A /* TemplateGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C932EF1491A5160098216A /* TemplateGame.cpp */; };
@@ -17,22 +17,9 @@
 		42C933171491A5EB0098216A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933161491A5EB0098216A /* OpenGL.framework */; };
 		42C9331D1491A6750098216A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9331C1491A6750098216A /* QuartzCore.framework */; };
 		42C9331F1491A67F0098216A /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9331E1491A67F0098216A /* OpenAL.framework */; };
-		42C933211491A6C70098216A /* libbullet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933201491A6C70098216A /* libbullet.a */; };
-		42C933261491A6E50098216A /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933221491A6E50098216A /* libogg.a */; };
-		42C933271491A6E50098216A /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933231491A6E50098216A /* libvorbis.a */; };
-		42C933281491A6E50098216A /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933241491A6E50098216A /* libvorbisenc.a */; };
-		42C933291491A6E50098216A /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933251491A6E50098216A /* libvorbisfile.a */; };
-		42C9332C1491A7680098216A /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9332A1491A7390098216A /* libpng.a */; };
 		42C9332F1491A78D0098216A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9332D1491A7810098216A /* libz.dylib */; };
 		5B61611614CCC24C0073B857 /* TemplateGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42C932EF1491A5160098216A /* TemplateGame.cpp */; };
 		5B61611814CCC24C0073B857 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42438B521491AD2000D218B8 /* libgameplay.a */; };
-		5B61611914CCC24C0073B857 /* libbullet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933201491A6C70098216A /* libbullet.a */; };
-		5B61611A14CCC24C0073B857 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933221491A6E50098216A /* libogg.a */; };
-		5B61611B14CCC24C0073B857 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933231491A6E50098216A /* libvorbis.a */; };
-		5B61611C14CCC24C0073B857 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933241491A6E50098216A /* libvorbisenc.a */; };
-		5B61611D14CCC24C0073B857 /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C933251491A6E50098216A /* libvorbisfile.a */; };
-		5B61611E14CCC24C0073B857 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9332A1491A7390098216A /* libpng.a */; };
-		5B61611F14CCC24C0073B857 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9332D1491A7810098216A /* libz.dylib */; };
 		5B61612614CCC24C0073B857 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42C932ED1491A4CB0098216A /* icon.png */; };
 		5B61612714CCC24C0073B857 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 42C932F21491A53E0098216A /* res */; };
 		5BAF206D152F2DDD003E2AC3 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BAF2067152F2DDD003E2AC3 /* CoreMotion.framework */; };
@@ -41,12 +28,27 @@
 		5BAF2070152F2DDD003E2AC3 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BAF206A152F2DDD003E2AC3 /* OpenGLES.framework */; };
 		5BAF2071152F2DDD003E2AC3 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BAF206B152F2DDD003E2AC3 /* QuartzCore.framework */; };
 		5BAF2072152F2DDD003E2AC3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BAF206C152F2DDD003E2AC3 /* UIKit.framework */; };
+		F1F49B8B16AD8E02008715A2 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49B8A16AD8E02008715A2 /* libz.dylib */; };
+		F1F49B8D16AD8F1B008715A2 /* libbullet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49B8C16AD8F1B008715A2 /* libbullet.a */; };
+		F1F49B8F16AD8F3F008715A2 /* libbullet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49B8E16AD8F3F008715A2 /* libbullet.a */; };
+		F1F49BC616AD94EE008715A2 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BC216AD94EE008715A2 /* libogg.a */; };
+		F1F49BC716AD94EE008715A2 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BC316AD94EE008715A2 /* libvorbis.a */; };
+		F1F49BC816AD94EE008715A2 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BC416AD94EE008715A2 /* libvorbisenc.a */; };
+		F1F49BC916AD94EE008715A2 /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BC516AD94EE008715A2 /* libvorbisfile.a */; };
+		F1F49BCC16AD9502008715A2 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BCB16AD9502008715A2 /* libpng.a */; };
+		F1F49BD116AD951A008715A2 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BCD16AD951A008715A2 /* libogg.a */; };
+		F1F49BD216AD951A008715A2 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BCE16AD951A008715A2 /* libvorbis.a */; };
+		F1F49BD316AD951A008715A2 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BCF16AD951A008715A2 /* libvorbisenc.a */; };
+		F1F49BD416AD951A008715A2 /* libvorbisfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BD016AD951A008715A2 /* libvorbisfile.a */; };
+		F1F49BD616AD9535008715A2 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BD516AD9535008715A2 /* libpng.a */; };
+		F1F49BEE16AD9BD4008715A2 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BED16AD9BD4008715A2 /* liblua.a */; };
+		F1F49BF116AD9BFB008715A2 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F1F49BF016AD9BFB008715A2 /* liblua.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		428F7BDD15CB131A009ED24C /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
 		42438B521491AD2000D218B8 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "~/Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug/libgameplay.a"; sourceTree = "<group>"; };
 		424CC03B161FCBDD00577827 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
+		428F7BDD15CB131A009ED24C /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
 		42C932BC1491A0DB0098216A /* TEMPLATE_PROJECT-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "TEMPLATE_PROJECT-macosx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		42C932C01491A0DB0098216A /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		42C932ED1491A4CB0098216A /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
@@ -56,12 +58,6 @@
 		42C933161491A5EB0098216A /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		42C9331C1491A6750098216A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		42C9331E1491A67F0098216A /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
-		42C933201491A6C70098216A /* libbullet.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbullet.a; path = "GAMEPLAY_PATH/external-deps/bullet/lib/macosx/libbullet.a"; sourceTree = "<group>"; };
-		42C933221491A6E50098216A /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "GAMEPLAY_PATH/external-deps/oggvorbis/lib/macosx/libogg.a"; sourceTree = "<group>"; };
-		42C933231491A6E50098216A /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "GAMEPLAY_PATH/external-deps/oggvorbis/lib/macosx/libvorbis.a"; sourceTree = "<group>"; };
-		42C933241491A6E50098216A /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = "GAMEPLAY_PATH/external-deps/oggvorbis/lib/macosx/libvorbisenc.a"; sourceTree = "<group>"; };
-		42C933251491A6E50098216A /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "GAMEPLAY_PATH/external-deps/oggvorbis/lib/macosx/libvorbisfile.a"; sourceTree = "<group>"; };
-		42C9332A1491A7390098216A /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "GAMEPLAY_PATH/external-deps/libpng/lib/macosx/libpng.a"; sourceTree = "<group>"; };
 		42C9332D1491A7810098216A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		5B61611214CCC2200073B857 /* TEMPLATE_PROJECT-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TEMPLATE_PROJECT-macosx.plist"; sourceTree = "<group>"; };
 		5B61612C14CCC24C0073B857 /* TEMPLATE_PROJECT-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "TEMPLATE_PROJECT-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -74,6 +70,21 @@
 		5BAF206C152F2DDD003E2AC3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		5BC4E77F150F879E00CBE1C0 /* gameplay.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gameplay.xcodeproj; path = GAMEPLAY_PATH/gameplay/gameplay.xcodeproj; sourceTree = SOURCE_ROOT; };
 		5BC4E849150F911D00CBE1C0 /* shaders */ = {isa = PBXFileReference; lastKnownFileType = text; name = shaders; path = GAMEPLAY_PATH/gameplay/res/shaders; sourceTree = SOURCE_ROOT; };
+		F1F49B8A16AD8E02008715A2 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
+		F1F49B8C16AD8F1B008715A2 /* libbullet.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbullet.a; path = GAMEPLAY_PATH/bullet/lib/macosx/libbullet.a; sourceTree = "<group>"; };
+		F1F49B8E16AD8F3F008715A2 /* libbullet.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbullet.a; path = "GAMEPLAY_PATH/bullet/lib/ios/$(CURRENT_ARCH)/libbullet.a"; sourceTree = "<group>"; };
+		F1F49BC216AD94EE008715A2 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = GAMEPLAY_PATH/oggvorbis/lib/macosx/libogg.a; sourceTree = "<group>"; };
+		F1F49BC316AD94EE008715A2 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = GAMEPLAY_PATH/oggvorbis/lib/macosx/libvorbis.a; sourceTree = "<group>"; };
+		F1F49BC416AD94EE008715A2 /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = GAMEPLAY_PATH/oggvorbis/lib/macosx/libvorbisenc.a; sourceTree = "<group>"; };
+		F1F49BC516AD94EE008715A2 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = GAMEPLAY_PATH/oggvorbis/lib/macosx/libvorbisfile.a; sourceTree = "<group>"; };
+		F1F49BCB16AD9502008715A2 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = GAMEPLAY_PATH/libpng/lib/macosx/libpng.a; sourceTree = "<group>"; };
+		F1F49BCD16AD951A008715A2 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "GAMEPLAY_PATH/oggvorbis/lib/ios/$(CURRENT_ARCH)/libogg.a"; sourceTree = "<group>"; };
+		F1F49BCE16AD951A008715A2 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "GAMEPLAY_PATH/oggvorbis/lib/ios/$(CURRENT_ARCH)/libvorbis.a"; sourceTree = "<group>"; };
+		F1F49BCF16AD951A008715A2 /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = "GAMEPLAY_PATH/oggvorbis/lib/ios/$(CURRENT_ARCH)/libvorbisenc.a"; sourceTree = "<group>"; };
+		F1F49BD016AD951A008715A2 /* libvorbisfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisfile.a; path = "GAMEPLAY_PATH/oggvorbis/lib/ios/$(CURRENT_ARCH)/libvorbisfile.a"; sourceTree = "<group>"; };
+		F1F49BD516AD9535008715A2 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "GAMEPLAY_PATH/libpng/lib/ios/$(CURRENT_ARCH)/libpng.a"; sourceTree = "<group>"; };
+		F1F49BED16AD9BD4008715A2 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "GAMEPLAY_PATH/lua/lib/macosx/liblua.a"; sourceTree = "<group>"; };
+		F1F49BF016AD9BFB008715A2 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "GAMEPLAY_PATH/lua/lib/ios/$(CURRENT_ARCH)/liblua.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -82,12 +93,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				42438B531491AD2000D218B8 /* libgameplay.a in Frameworks */,
-				42C933211491A6C70098216A /* libbullet.a in Frameworks */,
-				42C933261491A6E50098216A /* libogg.a in Frameworks */,
-				42C933271491A6E50098216A /* libvorbis.a in Frameworks */,
-				42C933281491A6E50098216A /* libvorbisenc.a in Frameworks */,
-				42C933291491A6E50098216A /* libvorbisfile.a in Frameworks */,
-				42C9332C1491A7680098216A /* libpng.a in Frameworks */,
+				F1F49B8D16AD8F1B008715A2 /* libbullet.a in Frameworks */,
+				F1F49BEE16AD9BD4008715A2 /* liblua.a in Frameworks */,
+				F1F49BC616AD94EE008715A2 /* libogg.a in Frameworks */,
+				F1F49BC716AD94EE008715A2 /* libvorbis.a in Frameworks */,
+				F1F49BC816AD94EE008715A2 /* libvorbisenc.a in Frameworks */,
+				F1F49BC916AD94EE008715A2 /* libvorbisfile.a in Frameworks */,
+				F1F49BCC16AD9502008715A2 /* libpng.a in Frameworks */,
 				42C9332F1491A78D0098216A /* libz.dylib in Frameworks */,
 				424CC03C161FCBDD00577827 /* IOKit.framework in Frameworks */,
 				42C932C11491A0DB0098216A /* Cocoa.framework in Frameworks */,
@@ -101,20 +113,21 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5B61611814CCC24C0073B857 /* libgameplay.a in Frameworks */,
+				F1F49B8F16AD8F3F008715A2 /* libbullet.a in Frameworks */,
+				F1F49BF116AD9BFB008715A2 /* liblua.a in Frameworks */,
+				F1F49BD116AD951A008715A2 /* libogg.a in Frameworks */,
+				F1F49BD216AD951A008715A2 /* libvorbis.a in Frameworks */,
+				F1F49BD316AD951A008715A2 /* libvorbisenc.a in Frameworks */,
+				F1F49BD416AD951A008715A2 /* libvorbisfile.a in Frameworks */,
+				F1F49BD616AD9535008715A2 /* libpng.a in Frameworks */,
+				F1F49B8B16AD8E02008715A2 /* libz.dylib in Frameworks */,
 				5BAF206D152F2DDD003E2AC3 /* CoreMotion.framework in Frameworks */,
 				5BAF206E152F2DDD003E2AC3 /* Foundation.framework in Frameworks */,
 				5BAF206F152F2DDD003E2AC3 /* OpenAL.framework in Frameworks */,
 				5BAF2070152F2DDD003E2AC3 /* OpenGLES.framework in Frameworks */,
 				5BAF2071152F2DDD003E2AC3 /* QuartzCore.framework in Frameworks */,
 				5BAF2072152F2DDD003E2AC3 /* UIKit.framework in Frameworks */,
-				5B61611814CCC24C0073B857 /* libgameplay.a in Frameworks */,
-				5B61611914CCC24C0073B857 /* libbullet.a in Frameworks */,
-				5B61611A14CCC24C0073B857 /* libogg.a in Frameworks */,
-				5B61611B14CCC24C0073B857 /* libvorbis.a in Frameworks */,
-				5B61611C14CCC24C0073B857 /* libvorbisenc.a in Frameworks */,
-				5B61611D14CCC24C0073B857 /* libvorbisfile.a in Frameworks */,
-				5B61611E14CCC24C0073B857 /* libpng.a in Frameworks */,
-				5B61611F14CCC24C0073B857 /* libz.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -148,7 +161,6 @@
 		42C932BF1491A0DB0098216A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				5BC4E825150F8CE600CBE1C0 /* GamePlay */,
 				5B61613A14CCC3590073B857 /* MacOSX */,
 				5B61613914CCC3560073B857 /* iOS */,
 			);
@@ -168,13 +180,9 @@
 			isa = PBXGroup;
 			children = (
 				42438B521491AD2000D218B8 /* libgameplay.a */,
-				42C933201491A6C70098216A /* libbullet.a */,
-				42C933221491A6E50098216A /* libogg.a */,
-				42C933231491A6E50098216A /* libvorbis.a */,
-				42C933241491A6E50098216A /* libvorbisenc.a */,
-				42C933251491A6E50098216A /* libvorbisfile.a */,
-				42C9332A1491A7390098216A /* libpng.a */,
-				42C9332D1491A7810098216A /* libz.dylib */,
+				5BC4E825150F8CE600CBE1C0 /* GamePlay */,
+				F1F49B8516AD8C22008715A2 /* MacOSX */,
+				F1F49B8716AD8C30008715A2 /* iOS */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -213,6 +221,36 @@
 			name = GamePlay;
 			sourceTree = "<group>";
 		};
+		F1F49B8516AD8C22008715A2 /* MacOSX */ = {
+			isa = PBXGroup;
+			children = (
+				F1F49B8C16AD8F1B008715A2 /* libbullet.a */,
+				F1F49BED16AD9BD4008715A2 /* liblua.a */,
+				F1F49BC216AD94EE008715A2 /* libogg.a */,
+				F1F49BC316AD94EE008715A2 /* libvorbis.a */,
+				F1F49BC416AD94EE008715A2 /* libvorbisenc.a */,
+				F1F49BC516AD94EE008715A2 /* libvorbisfile.a */,
+				F1F49BCB16AD9502008715A2 /* libpng.a */,
+				42C9332D1491A7810098216A /* libz.dylib */,
+			);
+			name = MacOSX;
+			sourceTree = "<group>";
+		};
+		F1F49B8716AD8C30008715A2 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				F1F49B8E16AD8F3F008715A2 /* libbullet.a */,
+				F1F49BF016AD9BFB008715A2 /* liblua.a */,
+				F1F49BCD16AD951A008715A2 /* libogg.a */,
+				F1F49BCE16AD951A008715A2 /* libvorbis.a */,
+				F1F49BCF16AD951A008715A2 /* libvorbisenc.a */,
+				F1F49BD016AD951A008715A2 /* libvorbisfile.a */,
+				F1F49BD516AD9535008715A2 /* libpng.a */,
+				F1F49B8A16AD8E02008715A2 /* libz.dylib */,
+			);
+			name = iOS;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -420,6 +458,7 @@
 					"\"GAMEPLAY_PATH/external-deps/libpng/lib/macosx\"",
 					"\"GAMEPLAY_PATH/external-deps/bullet/lib/macosx\"",
 					"\"GAMEPLAY_PATH/external-deps/oggvorbis/lib/macosx\"",
+					"\"GAMEPLAY_PATH/external-deps/lua/lib/macosx\"",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "";
@@ -447,6 +486,7 @@
 					"\"GAMEPLAY_PATH/external-deps/libpng/lib/macosx\"",
 					"\"GAMEPLAY_PATH/external-deps/bullet/lib/macosx\"",
 					"\"GAMEPLAY_PATH/external-deps/oggvorbis/lib/macosx\"",
+					"\"GAMEPLAY_PATH/external-deps/lua/lib/macosx\"",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "";
@@ -457,7 +497,7 @@
 		5B61612A14CCC24C0073B857 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
@@ -470,15 +510,16 @@
 					"GAMEPLAY_PATH/external-deps/lua/include",
 				);
 				INFOPLIST_FILE = "TEMPLATE_PROJECT-ios.plist";
-                IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"GAMEPLAY_PATH/external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
 					"\"GAMEPLAY_PATH/external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
 					"\"GAMEPLAY_PATH/external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
+					"\"GAMEPLAY_PATH/external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
 				);
 				SDKROOT = iphoneos;
-                TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 				WRAPPER_EXTENSION = app;
 			};
@@ -487,7 +528,7 @@
 		5B61612B14CCC24C0073B857 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
@@ -500,15 +541,16 @@
 					"GAMEPLAY_PATH/external-deps/lua/include",
 				);
 				INFOPLIST_FILE = "TEMPLATE_PROJECT-ios.plist";
-                IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"GAMEPLAY_PATH/external-deps/libpng/lib/ios/$(CURRENT_ARCH)\"",
 					"\"GAMEPLAY_PATH/external-deps/bullet/lib/ios/$(CURRENT_ARCH)\"",
 					"\"GAMEPLAY_PATH/external-deps/oggvorbis/lib/ios/$(CURRENT_ARCH)\"",
+					"\"GAMEPLAY_PATH/external-deps/lua/lib/ios/$(CURRENT_ARCH)\"",
 				);
 				SDKROOT = iphoneos;
-                TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 				WRAPPER_EXTENSION = app;
 			};