Merge pull request #1654 from seanpaultaylor/next

Updated QTCreator for MacOSX

gameplay/gameplay.pro

@@ -37,7 +37,6 @@ SOURCES += src/AbsoluteLayout.cpp \
     src/Control.cpp \
     src/ControlFactory.cpp \
     src/Curve.cpp \
-    src/DebugNew.cpp \
     src/DepthStencilTarget.cpp \
     src/Effect.cpp \
     src/FileSystem.cpp \
@@ -49,9 +48,6 @@ SOURCES += src/AbsoluteLayout.cpp \
     src/Game.cpp \
     src/Game.inl \
     src/Gamepad.cpp \
-    src/gameplay-main-android.cpp \
-    src/gameplay-main-linux.cpp \
-    src/gameplay-main-windows.cpp \
     src/HeightField.cpp \
     src/Image.cpp \
     src/Image.inl \
@@ -100,9 +96,6 @@ SOURCES += src/AbsoluteLayout.cpp \
     src/Plane.cpp \
     src/Plane.inl \
     src/Platform.cpp \
-    src/PlatformAndroid.cpp \
-    src/PlatformLinux.cpp \
-    src/PlatformWindows.cpp \
     src/Properties.cpp \
     src/Quaternion.cpp \
     src/Quaternion.inl \
@@ -298,7 +291,6 @@ HEADERS += src/AbsoluteLayout.h \
     src/Control.h \
     src/ControlFactory.h \
     src/Curve.h \
-    src/DebugNew.h \
     src/DepthStencilTarget.h \
     src/Effect.h \
     src/FileSystem.h \
@@ -515,27 +507,39 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_VertexFormatElement.h \
     src/lua/lua_VerticalLayout.h
 
+DEFINES += GP_USE_GAMEPAD
 INCLUDEPATH += $$PWD/../gameplay/src
 INCLUDEPATH += $$PWD/../external-deps/include
 INCLUDEPATH += $$PWD/../external-deps/include/bullet
 
-linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/atk-1.0
-linux:!android: INCLUDEPATH += /usr/include/cairo
-linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-linux:!android: INCLUDEPATH += /usr/include/pango-1.0
-linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
-linux:!android: INCLUDEPATH += /usr/include/freetype2
-linux:!android: INCLUDEPATH += /usr/include/glib-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/pixman-1
-linux:!android: INCLUDEPATH += /usr/include/libpng12
-linux:!android: INCLUDEPATH += /usr/include/harfbuzz
-DEPENDPATH += INCLUDEPATH
-
-linux:!android: DEFINES += GP_USE_GAMEPAD
-linux:!android: DEFINES += __linux__
-linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
-
+# linux
+linux: SOURCES += src/PlatformLinux.cpp
+linux:: SORCES += src/gameplay-main-linux.cpp
+linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+linux: INCLUDEPATH += /usr/include/gtk-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux: INCLUDEPATH += /usr/include/atk-1.0
+linux: INCLUDEPATH += /usr/include/cairo
+linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux: INCLUDEPATH += /usr/include/pango-1.0
+linux: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux: INCLUDEPATH += /usr/include/freetype2
+linux: INCLUDEPATH += /usr/include/glib-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux: INCLUDEPATH += /usr/include/pixman-1
+linux: INCLUDEPATH += /usr/include/libpng12
+linux: INCLUDEPATH += /usr/include/harfbuzz
 
+# macosx
+macx: OBJECTIVE_SOURCES += src/PlatformMacOSX.mm
+macx: OBJECTIVE_SOURCES += src/gameplay-main-macosx.mm
+macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64 -v
+macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64 -v
+macx: LIBS += -L$$PWD/../../external-deps/libs/MacOS/x86_64/ -lgameplay-deps
+macx: LIBS += -F/System/Library/Frameworks -framework GameKit
+macx: LIBS += -F/System/Library/Frameworks -framework IOKit
+macx: LIBS += -F/System/Library/Frameworks -framework QuartzCore
+macx: LIBS += -F/System/Library/Frameworks -framework OpenAL
+macx: LIBS += -F/System/Library/Frameworks -framework OpenGL
+macx: LIBS += -F/System/Library/Frameworks -framework Cocoa

gameplay/gameplay.xcodeproj/project.pbxproj

@@ -1337,7 +1337,6 @@
 			children = (
 				5BC4E7D4150F8C3C00CBE1C0 /* res */,
 				4234D9A314686C52003031B3 /* src */,
-				427D4F42147DC8DE0076760E /* Libraries */,
 				42CCD4AF146D811D00353661 /* Frameworks */,
 				4234D99B14686C52003031B3 /* Products */,
 			);
@@ -1611,15 +1610,6 @@
 			path = gameplay;
 			sourceTree = "<group>";
 		};
-		427D4F42147DC8DE0076760E /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				5B5ADCE114C22DC700AC6109 /* MacOSX */,
-				5B5ADCE014C22DBE00AC6109 /* iOS */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
 		42CCD4AF146D811D00353661 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -1656,20 +1646,6 @@
 			name = MacOSX;
 			sourceTree = "<group>";
 		};
-		5B5ADCE014C22DBE00AC6109 /* iOS */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = iOS;
-			sourceTree = "<group>";
-		};
-		5B5ADCE114C22DC700AC6109 /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = MacOSX;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */

samples/browser/sample-browser.pro

@@ -61,43 +61,53 @@ HEADERS += src/Audio3DSample.h \
     src/TriangleSample.h \
     src/WaterSample.h
 
+DEFINES += GP_USE_GAMEPAD
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
 INCLUDEPATH += $$PWD/../../external-deps/include/bullet
+LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 
-linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/atk-1.0
-linux:!android: INCLUDEPATH += /usr/include/cairo
-linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-linux:!android: INCLUDEPATH += /usr/include/pango-1.0
-linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
-linux:!android: INCLUDEPATH += /usr/include/freetype2
-linux:!android: INCLUDEPATH += /usr/include/glib-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/pixman-1
-linux:!android: INCLUDEPATH += /usr/include/libpng12
-linux:!android: INCLUDEPATH += /usr/include/harfbuzz
+linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+linux: INCLUDEPATH += /usr/include/gtk-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux: INCLUDEPATH += /usr/include/atk-1.0
+linux: INCLUDEPATH += /usr/include/cairo
+linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux: INCLUDEPATH += /usr/include/pango-1.0
+linux: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux: INCLUDEPATH += /usr/include/freetype2
+linux: INCLUDEPATH += /usr/include/glib-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux: INCLUDEPATH += /usr/include/pixman-1
+linux: INCLUDEPATH += /usr/include/libpng12
+linux: INCLUDEPATH += /usr/include/harfbuzz
+linux: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
+linux: LIBS += -lm
+linux: LIBS += -lGL
+linux: LIBS += -lrt
+linux: LIBS += -ldl
+linux: LIBS += -lX11
+linux: LIBS += -lpthread
+linux: LIBS += -lgtk-x11-2.0
+linux: LIBS += -lglib-2.0
+linux: LIBS += -lgobject-2.0
+linux: PRE_TARGETDEPS += $$PWD/../../external-deps/libs/Linux/x86_64/libgameplay-deps.a
+linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-linux:!android: DEFINES += GP_USE_GAMEPAD
-linux:!android: DEFINES += __linux__
-linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+macx: LIBS += -L$$PWD/../../external-deps/libs/MacOS/x86_64/ -lgameplay-deps
+macx: LIBS += -F/System/Library/Frameworks -framework GameKit
+macx: LIBS += -F/System/Library/Frameworks -framework IOKit
+macx: LIBS += -F/System/Library/Frameworks -framework QuartzCore
+macx: LIBS += -F/System/Library/Frameworks -framework OpenAL
+macx: LIBS += -F/System/Library/Frameworks -framework OpenGL
+macx: LIBS += -F/System/Library/Frameworks -framework Cocoa
+macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
-linux:!android: LIBS += -lm
-linux:!android: LIBS += -lGL
-linux:!android: LIBS += -lrt
-linux:!android: LIBS += -ldl
-linux:!android: LIBS += -lX11
-linux:!android: LIBS += -lpthread
-linux:!android: LIBS += -lgtk-x11-2.0
-linux:!android: LIBS += -lglib-2.0
-linux:!android: LIBS += -lgobject-2.0
-
-linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/libs/Linux/x86_64/libgameplay-deps.a
-
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))

samples/browser/sample-browser.xcodeproj/project.pbxproj

@@ -41,7 +41,6 @@
 		424CC030161F8E3000577827 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424CC02F161F8E3000577827 /* IOKit.framework */; };
 		4258369D1A0F2AF400AFDFEB /* WaterSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4258369B1A0F2AF400AFDFEB /* WaterSample.cpp */; };
 		4258369E1A0F2AF400AFDFEB /* WaterSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4258369B1A0F2AF400AFDFEB /* WaterSample.cpp */; };
-		425F3A5617FBCBF00085454F /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 425F3A5517FBCBF00085454F /* libgameplay.a */; };
 		428F7BDE15CB131A009ED24C /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 428F7BDD15CB131A009ED24C /* game.config */; };
 		42A1BA201A27BCE200BF506D /* ParticlesSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42A1BA1E1A27BCE200BF506D /* ParticlesSample.cpp */; };
 		42A1BA211A27BCE200BF506D /* ParticlesSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42A1BA1E1A27BCE200BF506D /* ParticlesSample.cpp */; };
@@ -113,15 +112,11 @@
 		420D545615FE430D00AD0B91 /* TriangleSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriangleSample.cpp; sourceTree = "<group>"; };
 		420D545715FE430D00AD0B91 /* TriangleSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriangleSample.h; sourceTree = "<group>"; };
 		421090E918299EBA00761E40 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/GameKit.framework; sourceTree = DEVELOPER_DIR; };
-		422E8EBE1956324B001DE81F /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletCollision.a"; sourceTree = "<group>"; };
-		422E8EBF1956324B001DE81F /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletDynamics.a"; sourceTree = "<group>"; };
-		422E8EC01956324B001DE81F /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/ios/armv7s/libLinearMath.a"; sourceTree = "<group>"; };
 		422FE592169690830062D1FE /* PostProcessSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PostProcessSample.cpp; sourceTree = "<group>"; };
 		422FE593169690830062D1FE /* PostProcessSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostProcessSample.h; sourceTree = "<group>"; };
 		424CC02F161F8E3000577827 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		4258369B1A0F2AF400AFDFEB /* WaterSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaterSample.cpp; sourceTree = "<group>"; };
 		4258369C1A0F2AF400AFDFEB /* WaterSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaterSample.h; sourceTree = "<group>"; };
-		425F3A5517FBCBF00085454F /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "/Users/setaylor/Code/GamePlay/samples/character/../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos/libgameplay.a"; sourceTree = "<absolute>"; };
 		428F7BDD15CB131A009ED24C /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
 		42A1BA1E1A27BCE200BF506D /* ParticlesSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParticlesSample.cpp; sourceTree = "<group>"; };
 		42A1BA1F1A27BCE200BF506D /* ParticlesSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParticlesSample.h; sourceTree = "<group>"; };
@@ -140,27 +135,15 @@
 		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; };
-		42C933221491A6E50098216A /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/macosx/x64/libogg.a"; sourceTree = "<group>"; };
-		42C933231491A6E50098216A /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/macosx/x64/libvorbis.a"; sourceTree = "<group>"; };
-		42C9332A1491A7390098216A /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/macosx/x64/libpng.a"; sourceTree = "<group>"; };
-		42C9332D1491A7810098216A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		42DFAABB16AD89670000F342 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAAD316AD8A8C0000F342 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAB1B16AD8BBC0000F342 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAB1C16AD8BBC0000F342 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAB1D16AD8BBC0000F342 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAB1E16AD8BBC0000F342 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAB2316AD8C1C0000F342 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
-		42DFAB9A16AD90080000F342 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/ios/armv7s/libogg.a"; sourceTree = "<group>"; };
-		42DFAB9B16AD90080000F342 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/ios/armv7s/libvorbis.a"; sourceTree = "<group>"; };
-		42DFABD016AD961C0000F342 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug/libgameplay.a"; sourceTree = "<group>"; };
 		42DFABD216AD96F10000F342 /* TerrainSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TerrainSample.cpp; sourceTree = "<group>"; };
 		42DFABD316AD96F10000F342 /* TerrainSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TerrainSample.h; sourceTree = "<group>"; };
-		42F2377116AD99EA0019CAC9 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/ios/armv7s/libpng.a"; sourceTree = "<group>"; };
 		42F237A716AD9DD70019CAC9 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		42FA64631953DF8100337ABC /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletCollision.a"; sourceTree = "<group>"; };
-		42FA64641953DF8100337ABC /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletDynamics.a"; sourceTree = "<group>"; };
-		42FA64651953DF8100337ABC /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/macosx/x64/libLinearMath.a"; sourceTree = "<group>"; };
 		435FC4081A53449B003D4E9C /* libgameplay-deps.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgameplay-deps.a"; path = "../../external-deps/libs/MacOS/x86_64/libgameplay-deps.a"; sourceTree = "<group>"; };
 		435FC40C1A534AB4003D4E9C /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = ../../gameplay/Build/Products/Debug/libgameplay.a; sourceTree = "<group>"; };
 		435FC40E1A538315003D4E9C /* libgameplay-deps.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgameplay-deps.a"; path = "../../external-deps/libs/iOS/x86/libgameplay-deps.a"; sourceTree = "<group>"; };
@@ -174,8 +157,6 @@
 		F10DEAB616726157006FFFDC /* BillboardSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BillboardSample.h; sourceTree = "<group>"; };
 		F1E4B3F81671372E007516A7 /* FormsSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormsSample.cpp; sourceTree = "<group>"; };
 		F1E4B3F91671372E007516A7 /* FormsSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormsSample.h; sourceTree = "<group>"; };
-		F1F6195116A71DB100C4FEA1 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/x64/liblua.a"; sourceTree = "<group>"; };
-		F1F6195416A71DD000C4FEA1 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/ios/armv7s/liblua.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -204,7 +185,6 @@
 				42DFAB1F16AD8BBC0000F342 /* OpenAL.framework in Frameworks */,
 				421090EA18299EBA00761E40 /* GameKit.framework in Frameworks */,
 				42DFAB2016AD8BBC0000F342 /* OpenGLES.framework in Frameworks */,
-				425F3A5617FBCBF00085454F /* libgameplay.a in Frameworks */,
 				42DFAB2116AD8BBC0000F342 /* QuartzCore.framework in Frameworks */,
 				42DFAB2216AD8BBC0000F342 /* UIKit.framework in Frameworks */,
 			);
@@ -213,38 +193,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		4200E4C516AD880F00C94D0D /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-				42DFABD016AD961C0000F342 /* libgameplay.a */,
-				42FA64631953DF8100337ABC /* libBulletCollision.a */,
-				42FA64641953DF8100337ABC /* libBulletDynamics.a */,
-				42FA64651953DF8100337ABC /* libLinearMath.a */,
-				F1F6195116A71DB100C4FEA1 /* liblua.a */,
-				42C9332A1491A7390098216A /* libpng.a */,
-				42C933221491A6E50098216A /* libogg.a */,
-				42C933231491A6E50098216A /* libvorbis.a */,
-				42C9332D1491A7810098216A /* libz.dylib */,
-			);
-			name = MacOSX;
-			sourceTree = "<group>";
-		};
-		4200E4C716AD881C00C94D0D /* iOS */ = {
-			isa = PBXGroup;
-			children = (
-				425F3A5517FBCBF00085454F /* libgameplay.a */,
-				422E8EBE1956324B001DE81F /* libBulletCollision.a */,
-				422E8EBF1956324B001DE81F /* libBulletDynamics.a */,
-				422E8EC01956324B001DE81F /* libLinearMath.a */,
-				F1F6195416A71DD000C4FEA1 /* liblua.a */,
-				42F2377116AD99EA0019CAC9 /* libpng.a */,
-				42DFAB9A16AD90080000F342 /* libogg.a */,
-				42DFAB9B16AD90080000F342 /* libvorbis.a */,
-				42DFAB2316AD8C1C0000F342 /* libz.dylib */,
-			);
-			name = iOS;
-			sourceTree = "<group>";
-		};
 		420D547715FE433900AD0B91 /* common */ = {
 			isa = PBXGroup;
 			children = (
@@ -270,7 +218,6 @@
 				428F7BDD15CB131A009ED24C /* game.config */,
 				42C932F21491A53E0098216A /* res */,
 				42C932C61491A0DB0098216A /* src */,
-				42C932DD1491A1050098216A /* Libraries */,
 				42C932BF1491A0DB0098216A /* Frameworks */,
 				42C932BD1491A0DB0098216A /* Products */,
 			);
@@ -347,15 +294,6 @@
 			path = src;
 			sourceTree = "<group>";
 		};
-		42C932DD1491A1050098216A /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				4200E4C516AD880F00C94D0D /* MacOSX */,
-				4200E4C716AD881C00C94D0D /* iOS */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
 		5B61613914CCC3560073B857 /* iOS */ = {
 			isa = PBXGroup;
 			children = (

samples/character/sample-character.pro

@@ -13,45 +13,53 @@ SOURCES += src/CharacterGame.cpp
 
 HEADERS += src/CharacterGame.h 
 
+DEFINES += GP_USE_GAMEPAD
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
 INCLUDEPATH += $$PWD/../../external-deps/include/bullet
+LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 
-linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/atk-1.0
-linux:!android: INCLUDEPATH += /usr/include/cairo
-linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-linux:!android: INCLUDEPATH += /usr/include/pango-1.0
-linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
-linux:!android: INCLUDEPATH += /usr/include/freetype2
-linux:!android: INCLUDEPATH += /usr/include/glib-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/pixman-1
-linux:!android: INCLUDEPATH += /usr/include/libpng12
-linux:!android: INCLUDEPATH += /usr/include/harfbuzz
-
-linux:!android: DEFINES += GP_USE_GAMEPAD
-linux:!android: DEFINES += __linux__
-linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
-
-linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
-linux:!android: LIBS += -lm
-linux:!android: LIBS += -lGL
-linux:!android: LIBS += -lrt
-linux:!android: LIBS += -ldl
-linux:!android: LIBS += -lX11
-linux:!android: LIBS += -lpthread
-linux:!android: LIBS += -lgtk-x11-2.0
-linux:!android: LIBS += -lglib-2.0
-linux:!android: LIBS += -lgobject-2.0
-
-linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/libs/Linux/x86_64/libgameplay-deps.a
-
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config ../game.config$$escape_expand(\n\t))
+linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+linux: INCLUDEPATH += /usr/include/gtk-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux: INCLUDEPATH += /usr/include/atk-1.0
+linux: INCLUDEPATH += /usr/include/cairo
+linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux: INCLUDEPATH += /usr/include/pango-1.0
+linux: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux: INCLUDEPATH += /usr/include/freetype2
+linux: INCLUDEPATH += /usr/include/glib-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux: INCLUDEPATH += /usr/include/pixman-1
+linux: INCLUDEPATH += /usr/include/libpng12
+linux: INCLUDEPATH += /usr/include/harfbuzz
+linux: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
+linux: LIBS += -lm
+linux: LIBS += -lGL
+linux: LIBS += -lrt
+linux: LIBS += -ldl
+linux: LIBS += -lX11
+linux: LIBS += -lpthread
+linux: LIBS += -lgtk-x11-2.0
+linux: LIBS += -lglib-2.0
+linux: LIBS += -lgobject-2.0
+linux: PRE_TARGETDEPS += $$PWD/../../external-deps/libs/Linux/x86_64/libgameplay-deps.a
+linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
+
+macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+macx: LIBS += -L$$PWD/../../external-deps/libs/MacOS/x86_64/ -lgameplay-deps
+macx: LIBS += -F/System/Library/Frameworks -framework GameKit
+macx: LIBS += -F/System/Library/Frameworks -framework IOKit
+macx: LIBS += -F/System/Library/Frameworks -framework QuartzCore
+macx: LIBS += -F/System/Library/Frameworks -framework OpenAL
+macx: LIBS += -F/System/Library/Frameworks -framework OpenGL
+macx: LIBS += -F/System/Library/Frameworks -framework Cocoa
+macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 

samples/character/sample-character.xcodeproj/project.pbxproj

@@ -11,8 +11,6 @@
 		4239E08715755BDA005EA3F6 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 4239E08615755BDA005EA3F6 /* res */; };
 		4239E08815755BDA005EA3F6 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 4239E08615755BDA005EA3F6 /* res */; };
 		424CC038161FCB7B00577827 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424CC037161FCB7B00577827 /* IOKit.framework */; };
-		4284B96216ADABA400FB52B4 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4284B96116ADABA400FB52B4 /* libgameplay.a */; };
-		4284B96416ADABB000FB52B4 /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4284B96316ADABB000FB52B4 /* libgameplay.a */; };
 		4284B96E16ADABF400FB52B4 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4284B96D16ADABF400FB52B4 /* [email protected] */; };
 		42B7026915B0B137002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7026815B0B137002BB8C3 /* game.config */; };
 		42B7026A15B0B15D002BB8C3 /* game.config in Resources */ = {isa = PBXBuildFile; fileRef = 42B7026815B0B137002BB8C3 /* game.config */; };
@@ -29,31 +27,20 @@
 		42DFAB0116AD8B780000F342 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAAFD16AD8B780000F342 /* QuartzCore.framework */; };
 		42DFAB0216AD8B780000F342 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAAFE16AD8B780000F342 /* UIKit.framework */; };
 		435FC4111A538954003D4E9C /* libgameplay-deps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 435FC4101A538954003D4E9C /* libgameplay-deps.a */; };
-		435FC4131A538B45003D4E9C /* libgameplay-deps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 435FC4121A538B45003D4E9C /* libgameplay-deps.a */; };
-		5B43D1C814C35F4C008A5D9D /* CharacterGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CCD5AD146EC62000353661 /* CharacterGame.cpp */; };
+		435FC4171A538C5A003D4E9C /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 435FC4161A538C5A003D4E9C /* libgameplay.a */; };
+                435FC4131A538B45003D4E9C /* libgameplay-deps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 435FC4121A538B45003D4E9C /* libgameplay-deps.a */; };
+		435FC41B1A5395F0003D4E9C /* libgameplay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 435FC41A1A5395C3003D4E9C /* libgameplay.a */; };
+                5B43D1C814C35F4C008A5D9D /* CharacterGame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42CCD5AD146EC62000353661 /* CharacterGame.cpp */; };
 		5B43D1D814C35F4C008A5D9D /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 42CCD5B0146EC62A00353661 /* icon.png */; };
 		6212DAB61829D9E6006213DD /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6212DAB51829D9E6006213DD /* GameKit.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		421090EB18299EFB00761E40 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/GameKit.framework; sourceTree = DEVELOPER_DIR; };
-		422E8ED619586778001DE81F /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletCollision.a"; sourceTree = "<group>"; };
-		422E8ED719586778001DE81F /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletDynamics.a"; sourceTree = "<group>"; };
-		422E8ED819586778001DE81F /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/ios/armv7s/libLinearMath.a"; sourceTree = "<group>"; };
 		4239E08615755BDA005EA3F6 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = res; sourceTree = "<group>"; };
 		42458CBF14C3ABF800EFFB61 /* sample-character-ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample-character-ios.plist"; sourceTree = "<group>"; };
 		424CC037161FCB7B00577827 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		425EDA8B17FB3B2000AABF95 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/ios/armv7s/liblua.a"; sourceTree = "<absolute>"; };
-		425EDA8C17FB3B2000AABF95 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/ios/armv7s/libpng.a"; sourceTree = "<absolute>"; };
-		425EDA8D17FB3B2000AABF95 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/ios/armv7s/libogg.a"; sourceTree = "<absolute>"; };
-		425EDA8E17FB3B2000AABF95 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/ios/armv7s/libvorbis.a"; sourceTree = "<absolute>"; };
-		4284B96116ADABA400FB52B4 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug/libgameplay.a"; sourceTree = "<group>"; };
-		4284B96316ADABB000FB52B4 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos/libgameplay.a"; sourceTree = "<group>"; };
 		4284B96D16ADABF400FB52B4 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		42A1E9491955202600C26E5C /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletCollision.a"; sourceTree = "<group>"; };
-		42A1E94A1955202600C26E5C /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletDynamics.a"; sourceTree = "<group>"; };
-		42A1E94B1955202600C26E5C /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/macosx/x64/libLinearMath.a"; sourceTree = "<group>"; };
-		42B7026215B0A8F2002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/x64/liblua.a"; sourceTree = "<group>"; };
 		42B7026815B0B137002BB8C3 /* game.config */ = {isa = PBXFileReference; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
 		42C932E61491A1AC0098216A /* sample-character-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample-character-macosx.plist"; sourceTree = "<group>"; };
 		42CCD56C146EC4B300353661 /* sample-character-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample-character-macosx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -61,22 +48,19 @@
 		42CCD5A1146EC5BF00353661 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
 		42CCD5A3146EC5C600353661 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		42CCD5A5146EC5CE00353661 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		42CCD5A7146EC5DE00353661 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		42CCD5A9146EC5F000353661 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/macosx/x64/libpng.a"; sourceTree = "<group>"; };
 		42CCD5AD146EC62000353661 /* CharacterGame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterGame.cpp; path = src/CharacterGame.cpp; sourceTree = SOURCE_ROOT; };
 		42CCD5AE146EC62000353661 /* CharacterGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterGame.h; path = src/CharacterGame.h; sourceTree = SOURCE_ROOT; };
 		42CCD5B0146EC62A00353661 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
-		42CD0EFB147D93560000361E /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/macosx/x64/libogg.a"; sourceTree = "<group>"; };
-		42CD0EFC147D93560000361E /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/macosx/x64/libvorbis.a"; sourceTree = "<group>"; };
 		42DFAAC516AD89D80000F342 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAADB16AD8AE30000F342 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAAFB16AD8B780000F342 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAAFC16AD8B780000F342 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAAFD16AD8B780000F342 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAAFE16AD8B780000F342 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAB4316AD8E3F0000F342 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
 		435FC4101A538954003D4E9C /* libgameplay-deps.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgameplay-deps.a"; path = "../../external-deps/libs/MacOS/x86_64/libgameplay-deps.a"; sourceTree = "<group>"; };
+                435FC4161A538C5A003D4E9C /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = ../../gameplay/Build/Products/Debug/libgameplay.a; sourceTree = "<group>"; };
 		435FC4121A538B45003D4E9C /* libgameplay-deps.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgameplay-deps.a"; path = "../../external-deps/libs/iOS/x86/libgameplay-deps.a"; sourceTree = "<group>"; };
+                435FC41A1A5395C3003D4E9C /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../gameplay/Build/Products/Debug-iphoneos/libgameplay.a"; sourceTree = "<group>"; };
 		5B43D1DD14C35F4C008A5D9D /* sample-character-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample-character-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6212DAB51829D9E6006213DD /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		DDBBAE861574040C00D39DE7 /* game.dxt.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.dxt.config; sourceTree = "<group>"; };
@@ -88,8 +72,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+                                435FC4171A538C5A003D4E9C /* libgameplay.a in Frameworks */,
 				435FC4111A538954003D4E9C /* libgameplay-deps.a in Frameworks */,
-				4284B96216ADABA400FB52B4 /* libgameplay.a in Frameworks */,
 				6212DAB61829D9E6006213DD /* GameKit.framework in Frameworks */,
 				424CC038161FCB7B00577827 /* IOKit.framework in Frameworks */,
 				42CCD571146EC4B300353661 /* Cocoa.framework in Frameworks */,
@@ -103,8 +87,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+                                435FC4171A538C5A003D4E9C /* libgameplay.a in Frameworks */,
 				435FC4131A538B45003D4E9C /* libgameplay-deps.a in Frameworks */,
-				4284B96416ADABB000FB52B4 /* libgameplay.a in Frameworks */,
 				42DFAAC616AD89D80000F342 /* CoreMotion.framework in Frameworks */,
 				42DFAADC16AD8AE30000F342 /* Foundation.framework in Frameworks */,
 				42DFAAFF16AD8B780000F342 /* OpenAL.framework in Frameworks */,
@@ -118,15 +102,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		427D4F4C147DC98E0076760E /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				42DFAB4216AD8E0F0000F342 /* MacOSX */,
-				42DFAB4116AD8DFC0000F342 /* iOS */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
 		42CCD561146EC4B300353661 = {
 			isa = PBXGroup;
 			children = (
@@ -139,7 +114,6 @@
 				DDBBAE8B1574067600D39DE7 /* game.pvrtc.config */,
 				4239E08615755BDA005EA3F6 /* res */,
 				42CCD576146EC4B300353661 /* src */,
-				427D4F4C147DC98E0076760E /* Libraries */,
 				42CCD56F146EC4B300353661 /* Frameworks */,
 				42CCD56D146EC4B300353661 /* Products */,
 			);
@@ -157,7 +131,9 @@
 		42CCD56F146EC4B300353661 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+                                435FC41A1A5395C3003D4E9C /* libgameplay.a */,
 				435FC4121A538B45003D4E9C /* libgameplay-deps.a */,
+                                435FC4161A538C5A003D4E9C /* libgameplay.a */,
 				435FC4101A538954003D4E9C /* libgameplay-deps.a */,
 				5B43D1F114C36054008A5D9D /* MacOSX */,
 				5B43D1F014C36051008A5D9D /* iOS */,
@@ -175,38 +151,6 @@
 			path = "sample-character";
 			sourceTree = "<group>";
 		};
-		42DFAB4116AD8DFC0000F342 /* iOS */ = {
-			isa = PBXGroup;
-			children = (
-				4284B96316ADABB000FB52B4 /* libgameplay.a */,
-				422E8ED619586778001DE81F /* libBulletCollision.a */,
-				422E8ED719586778001DE81F /* libBulletDynamics.a */,
-				422E8ED819586778001DE81F /* libLinearMath.a */,
-				425EDA8B17FB3B2000AABF95 /* liblua.a */,
-				425EDA8C17FB3B2000AABF95 /* libpng.a */,
-				425EDA8D17FB3B2000AABF95 /* libogg.a */,
-				425EDA8E17FB3B2000AABF95 /* libvorbis.a */,
-				42DFAB4316AD8E3F0000F342 /* libz.dylib */,
-			);
-			name = iOS;
-			sourceTree = "<group>";
-		};
-		42DFAB4216AD8E0F0000F342 /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-				4284B96116ADABA400FB52B4 /* libgameplay.a */,
-				42A1E9491955202600C26E5C /* libBulletCollision.a */,
-				42A1E94A1955202600C26E5C /* libBulletDynamics.a */,
-				42A1E94B1955202600C26E5C /* libLinearMath.a */,
-				42B7026215B0A8F2002BB8C3 /* liblua.a */,
-				42CCD5A9146EC5F000353661 /* libpng.a */,
-				42CD0EFB147D93560000361E /* libogg.a */,
-				42CD0EFC147D93560000361E /* libvorbis.a */,
-				42CCD5A7146EC5DE00353661 /* libz.dylib */,
-			);
-			name = MacOSX;
-			sourceTree = "<group>";
-		};
 		5B43D1F014C36051008A5D9D /* iOS */ = {
 			isa = PBXGroup;
 			children = (

samples/racer/sample-racer.pro

@@ -13,45 +13,52 @@ SOURCES += src/RacerGame.cpp
 
 HEADERS += src/RacerGame.h 
 
+DEFINES += GP_USE_GAMEPAD
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
 INCLUDEPATH += $$PWD/../../external-deps/include/bullet
+LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 
-linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/atk-1.0
-linux:!android: INCLUDEPATH += /usr/include/cairo
-linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-linux:!android: INCLUDEPATH += /usr/include/pango-1.0
-linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
-linux:!android: INCLUDEPATH += /usr/include/freetype2
-linux:!android: INCLUDEPATH += /usr/include/glib-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/pixman-1
-linux:!android: INCLUDEPATH += /usr/include/libpng12
-linux:!android: INCLUDEPATH += /usr/include/harfbuzz
-
-linux:!android: DEFINES += GP_USE_GAMEPAD
-linux:!android: DEFINES += __linux__
-linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
-
-linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
-linux:!android: LIBS += -lm
-linux:!android: LIBS += -lGL
-linux:!android: LIBS += -lrt
-linux:!android: LIBS += -ldl
-linux:!android: LIBS += -lX11
-linux:!android: LIBS += -lpthread
-linux:!android: LIBS += -lgtk-x11-2.0
-linux:!android: LIBS += -lglib-2.0
-linux:!android: LIBS += -lgobject-2.0
-
-linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/libs/Linux/x86_64/libgameplay-deps.a
-
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config ../game.config$$escape_expand(\n\t))
+linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+linux: INCLUDEPATH += /usr/include/gtk-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux: INCLUDEPATH += /usr/include/atk-1.0
+linux: INCLUDEPATH += /usr/include/cairo
+linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux: INCLUDEPATH += /usr/include/pango-1.0
+linux: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux: INCLUDEPATH += /usr/include/freetype2
+linux: INCLUDEPATH += /usr/include/glib-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux: INCLUDEPATH += /usr/include/pixman-1
+linux: INCLUDEPATH += /usr/include/libpng12
+linux: INCLUDEPATH += /usr/include/harfbuzz
+linux: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
+linux: LIBS += -lm
+linux: LIBS += -lGL
+linux: LIBS += -lrt
+linux: LIBS += -ldl
+linux: LIBS += -lX11
+linux: LIBS += -lpthread
+linux: LIBS += -lgtk-x11-2.0
+linux: LIBS += -lglib-2.0
+linux: LIBS += -lgobject-2.0
+linux: PRE_TARGETDEPS += $$PWD/../../external-deps/libs/Linux/x86_64/libgameplay-deps.a
+linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
+macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+macx: LIBS += -L$$PWD/../../external-deps/libs/MacOS/x86_64/ -lgameplay-deps
+macx: LIBS += -F/System/Library/Frameworks -framework GameKit
+macx: LIBS += -F/System/Library/Frameworks -framework IOKit
+macx: LIBS += -F/System/Library/Frameworks -framework QuartzCore
+macx: LIBS += -F/System/Library/Frameworks -framework OpenAL
+macx: LIBS += -F/System/Library/Frameworks -framework OpenGL
+macx: LIBS += -F/System/Library/Frameworks -framework Cocoa
+macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))

samples/racer/sample-racer.xcodeproj/project.pbxproj

@@ -39,14 +39,6 @@
 
 /* Begin PBXFileReference section */
 		421090F318299FAA00761E40 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/GameKit.framework; sourceTree = DEVELOPER_DIR; };
-		422E8EEE195867E1001DE81F /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletCollision.a"; sourceTree = "<group>"; };
-		422E8EEF195867E1001DE81F /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletDynamics.a"; sourceTree = "<group>"; };
-		422E8EF0195867E1001DE81F /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/ios/armv7s/libLinearMath.a"; 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 = "<absolute>"; };
-		42512C6E17FB414C00373866 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/ios/armv7s/liblua.a"; sourceTree = "<absolute>"; };
-		42512C6F17FB414C00373866 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/ios/armv7s/libpng.a"; sourceTree = "<absolute>"; };
-		42512C7017FB414C00373866 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/ios/armv7s/libogg.a"; sourceTree = "<absolute>"; };
-		42512C7117FB414C00373866 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/ios/armv7s/libvorbis.a"; sourceTree = "<absolute>"; };
 		42C932BC1491A0DB0098216A /* sample-racer-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample-racer-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,11 +48,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; };
-		42C933221491A6E50098216A /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/macosx/x64/libogg.a"; sourceTree = "<group>"; };
-		42C933231491A6E50098216A /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/macosx/x64/libvorbis.a"; sourceTree = "<group>"; };
-		42C9332A1491A7390098216A /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/macosx/x64/libpng.a"; sourceTree = "<group>"; };
-		42C9332D1491A7810098216A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		42CD5E7916ADB2D500C1D49D /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos/libgameplay.a"; sourceTree = "<group>"; };
 		42CD5E8716ADB34000C1D49D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		42D604DE16058F89003F3C48 /* game.dxt.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.dxt.config; sourceTree = "<group>"; };
 		42D604E116058F97003F3C48 /* game.pvr.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.pvr.config; sourceTree = "<group>"; };
@@ -70,10 +57,6 @@
 		42DFAAE416AD8B330000F342 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAAE516AD8B330000F342 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAAE616AD8B330000F342 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAB3916AD8D7A0000F342 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
-		42E0D2361955305500C99DA8 /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletCollision.a"; sourceTree = "<group>"; };
-		42E0D2371955305500C99DA8 /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletDynamics.a"; sourceTree = "<group>"; };
-		42E0D2381955305500C99DA8 /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/macosx/x64/libLinearMath.a"; sourceTree = "<group>"; };
 		435FC4141A538C36003D4E9C /* libgameplay-deps.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgameplay-deps.a"; path = "../../external-deps/libs/MacOS/x86_64/libgameplay-deps.a"; sourceTree = "<group>"; };
 		435FC4161A538C5A003D4E9C /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = ../../gameplay/Build/Products/Debug/libgameplay.a; sourceTree = "<group>"; };
 		435FC4181A5395A5003D4E9C /* libgameplay-deps.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgameplay-deps.a"; path = "../../external-deps/libs/iOS/x86/libgameplay-deps.a"; sourceTree = "<group>"; };
@@ -84,7 +67,6 @@
 		5B61612E14CCC24D0073B857 /* sample-racer-ios.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "sample-racer-ios.plist"; sourceTree = "<group>"; };
 		6212DAAD1829D910006213DD /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		F188C94A15C1971F0025FC73 /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
-		F1F6196816A7215E00C4FEA1 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/x64/liblua.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -134,7 +116,6 @@
 				42D604E116058F97003F3C48 /* game.pvr.config */,
 				42C932F21491A53E0098216A /* res */,
 				42C932C61491A0DB0098216A /* src */,
-				42C932DD1491A1050098216A /* Libraries */,
 				42C932BF1491A0DB0098216A /* Frameworks */,
 				42C932BD1491A0DB0098216A /* Products */,
 			);
@@ -171,47 +152,6 @@
 			path = src;
 			sourceTree = "<group>";
 		};
-		42C932DD1491A1050098216A /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				42DFAAD216AD8A260000F342 /* MacOSX */,
-				42DFAAD116AD8A210000F342 /* iOS */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
-		42DFAAD116AD8A210000F342 /* iOS */ = {
-			isa = PBXGroup;
-			children = (
-				42CD5E7916ADB2D500C1D49D /* libgameplay.a */,
-				422E8EEE195867E1001DE81F /* libBulletCollision.a */,
-				422E8EEF195867E1001DE81F /* libBulletDynamics.a */,
-				422E8EF0195867E1001DE81F /* libLinearMath.a */,
-				42512C6E17FB414C00373866 /* liblua.a */,
-				42512C6F17FB414C00373866 /* libpng.a */,
-				42512C7017FB414C00373866 /* libogg.a */,
-				42512C7117FB414C00373866 /* libvorbis.a */,
-				42DFAB3916AD8D7A0000F342 /* libz.dylib */,
-			);
-			name = iOS;
-			sourceTree = "<group>";
-		};
-		42DFAAD216AD8A260000F342 /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-				42438B521491AD2000D218B8 /* libgameplay.a */,
-				42E0D2361955305500C99DA8 /* libBulletCollision.a */,
-				42E0D2371955305500C99DA8 /* libBulletDynamics.a */,
-				42E0D2381955305500C99DA8 /* libLinearMath.a */,
-				F1F6196816A7215E00C4FEA1 /* liblua.a */,
-				42C9332A1491A7390098216A /* libpng.a */,
-				42C933221491A6E50098216A /* libogg.a */,
-				42C933231491A6E50098216A /* libvorbis.a */,
-				42C9332D1491A7810098216A /* libz.dylib */,
-			);
-			name = MacOSX;
-			sourceTree = "<group>";
-		};
 		5B61613914CCC3560073B857 /* iOS */ = {
 			isa = PBXGroup;
 			children = (

samples/spaceship/sample-spaceship.pro

@@ -13,45 +13,52 @@ SOURCES += src/SpaceshipGame.cpp
 
 HEADERS += src/SpaceshipGame.h 
 
+DEFINES += GP_USE_GAMEPAD
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
 INCLUDEPATH += $$PWD/../../external-deps/include/bullet
+LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 
-linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/atk-1.0
-linux:!android: INCLUDEPATH += /usr/include/cairo
-linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-linux:!android: INCLUDEPATH += /usr/include/pango-1.0
-linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
-linux:!android: INCLUDEPATH += /usr/include/freetype2
-linux:!android: INCLUDEPATH += /usr/include/glib-2.0
-linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-linux:!android: INCLUDEPATH += /usr/include/pixman-1
-linux:!android: INCLUDEPATH += /usr/include/libpng12
-linux:!android: INCLUDEPATH += /usr/include/harfbuzz
-DEPENDPATH += INCLUDEPATH
-
-linux:!android: DEFINES += GP_USE_GAMEPAD
-linux:!android: DEFINES += __linux__
-linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
-
-linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
-linux:!android: LIBS += -lm
-linux:!android: LIBS += -lGL
-linux:!android: LIBS += -lrt
-linux:!android: LIBS += -ldl
-linux:!android: LIBS += -lX11
-linux:!android: LIBS += -lpthread
-linux:!android: LIBS += -lgtk-x11-2.0
-linux:!android: LIBS += -lglib-2.0
-linux:!android: LIBS += -lgobject-2.0
-
-linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/libs/Linux/x86_64/libgameplay-deps.a
-
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
+linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+linux: INCLUDEPATH += /usr/include/gtk-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux: INCLUDEPATH += /usr/include/atk-1.0
+linux: INCLUDEPATH += /usr/include/cairo
+linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux: INCLUDEPATH += /usr/include/pango-1.0
+linux: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux: INCLUDEPATH += /usr/include/freetype2
+linux: INCLUDEPATH += /usr/include/glib-2.0
+linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux: INCLUDEPATH += /usr/include/pixman-1
+linux: INCLUDEPATH += /usr/include/libpng12
+linux: INCLUDEPATH += /usr/include/harfbuzz
+linux: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
+linux: LIBS += -lm
+linux: LIBS += -lGL
+linux: LIBS += -lrt
+linux: LIBS += -ldl
+linux: LIBS += -lX11
+linux: LIBS += -lpthread
+linux: LIBS += -lgtk-x11-2.0
+linux: LIBS += -lglib-2.0
+linux: LIBS += -lgobject-2.0
+linux: PRE_TARGETDEPS += $$PWD/../../external-deps/libs/Linux/x86_64/libgameplay-deps.a
+linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
+macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+macx: LIBS += -L$$PWD/../../external-deps/libs/MacOS/x86_64/ -lgameplay-deps
+macx: LIBS += -F/System/Library/Frameworks -framework GameKit
+macx: LIBS += -F/System/Library/Frameworks -framework IOKit
+macx: LIBS += -F/System/Library/Frameworks -framework QuartzCore
+macx: LIBS += -F/System/Library/Frameworks -framework OpenAL
+macx: LIBS += -F/System/Library/Frameworks -framework OpenGL
+macx: LIBS += -F/System/Library/Frameworks -framework Cocoa
+macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))

samples/spaceship/sample-spaceship.xcodeproj/project.pbxproj

@@ -38,20 +38,9 @@
 /* Begin PBXFileReference section */
 		421090F518299FD800761E40 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/GameKit.framework; sourceTree = DEVELOPER_DIR; };
 		421090F718299FF500761E40 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/GameKit.framework; sourceTree = "<absolute>"; };
-		421A5DFA17FE6B0B00A6AA7C /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/macosx/x64/libpng.a"; sourceTree = "<group>"; };
-		422E8EF4195867F1001DE81F /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletCollision.a"; sourceTree = "<group>"; };
-		422E8EF5195867F1001DE81F /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/ios/armv7s/libBulletDynamics.a"; sourceTree = "<group>"; };
-		422E8EF6195867F1001DE81F /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/ios/armv7s/libLinearMath.a"; sourceTree = "<group>"; };
 		42458CBA14C3AB4D00EFFB61 /* sample-spaceship-ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample-spaceship-ios.plist"; sourceTree = "<group>"; };
 		424CC034161FCB5B00577827 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		42512C7C17FB424000373866 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/ios/armv7s/liblua.a"; sourceTree = "<absolute>"; };
-		42512C7D17FB424000373866 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = "../../external-deps/png/lib/ios/armv7s/libpng.a"; sourceTree = "<absolute>"; };
-		42512C7E17FB424000373866 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/ios/armv7s/libogg.a"; sourceTree = "<absolute>"; };
-		42512C7F17FB424000373866 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/ios/armv7s/libvorbis.a"; sourceTree = "<absolute>"; };
 		4284B8F516ADA63500FB52B4 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		4284B8FC16ADA7DF00FB52B4 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug/libgameplay.a"; sourceTree = "<group>"; };
-		4284B8FE16ADA7F400FB52B4 /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = "../../../../Library/Developer/Xcode/DerivedData/gameplay-exiunaubxxjndaapmcqkaoeboiob/Build/Products/Debug-iphoneos/libgameplay.a"; sourceTree = "<group>"; };
-		42B7025F15B0A8D5002BB8C3 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = "../../external-deps/lua/lib/macosx/x64/liblua.a"; sourceTree = "<group>"; };
 		42B7026E15B0B202002BB8C3 /* game.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = game.config; sourceTree = "<group>"; };
 		42C932E31491A18F0098216A /* sample-spaceship-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sample-spaceship-macosx.plist"; sourceTree = "<group>"; };
 		42CCD516146EBF3600353661 /* sample-spaceship-macosx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sample-spaceship-macosx.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -61,21 +50,14 @@
 		42CCD54A146EC10200353661 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		42CCD54C146EC10E00353661 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
 		42CCD54E146EC11600353661 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		42CCD557146EC22900353661 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		42CCD55D146EC24F00353661 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
 		42CCD55F146EC27A00353661 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = res; sourceTree = "<group>"; };
-		42CD0EEF147D932B0000361E /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "../../external-deps/ogg/lib/macosx/x64/libogg.a"; sourceTree = "<group>"; };
-		42CD0EF0147D932B0000361E /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = "../../external-deps/vorbis/lib/macosx/x64/libvorbis.a"; sourceTree = "<group>"; };
 		42DFAAC316AD89B80000F342 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAAD916AD8AD00000F342 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAB0316AD8B840000F342 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAB0416AD8B840000F342 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAB0516AD8B840000F342 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
 		42DFAB0616AD8B840000F342 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
-		42DFAB2F16AD8CA20000F342 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
-		42E0D23C195531E100C99DA8 /* libBulletCollision.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletCollision.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletCollision.a"; sourceTree = "<group>"; };
-		42E0D23D195531E100C99DA8 /* libBulletDynamics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBulletDynamics.a; path = "../../external-deps/bullet/lib/macosx/x64/libBulletDynamics.a"; sourceTree = "<group>"; };
-		42E0D23E195531E100C99DA8 /* libLinearMath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libLinearMath.a; path = "../../external-deps/bullet/lib/macosx/x64/libLinearMath.a"; sourceTree = "<group>"; };
 		435FC41C1A539829003D4E9C /* libgameplay-deps.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgameplay-deps.a"; path = "../../external-deps/libs/MacOS/x86_64/libgameplay-deps.a"; sourceTree = "<group>"; };
 		435FC41E1A53983C003D4E9C /* libgameplay.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgameplay.a; path = ../../gameplay/Build/Products/Debug/libgameplay.a; sourceTree = "<group>"; };
 		435FC4201A5398E8003D4E9C /* libgameplay-deps.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgameplay-deps.a"; path = "../../external-deps/libs/iOS/arm/libgameplay-deps.a"; sourceTree = "<group>"; };
@@ -118,15 +100,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		427D4F4A147DC9770076760E /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				42DFAB2E16AD8C8C0000F342 /* MacOSX */,
-				42DFAB2D16AD8C7F0000F342 /* iOS */,
-			);
-			name = Libraries;
-			sourceTree = "<group>";
-		};
 		42CCD50B146EBF3600353661 = {
 			isa = PBXGroup;
 			children = (
@@ -137,7 +110,6 @@
 				42CCD55D146EC24F00353661 /* icon.png */,
 				42CCD55F146EC27A00353661 /* res */,
 				42CCD520146EBF3600353661 /* src */,
-				427D4F4A147DC9770076760E /* Libraries */,
 				42CCD519146EBF3600353661 /* Frameworks */,
 				42CCD517146EBF3600353661 /* Products */,
 			);
@@ -175,38 +147,6 @@
 			path = "sample-spaceship";
 			sourceTree = "<group>";
 		};
-		42DFAB2D16AD8C7F0000F342 /* iOS */ = {
-			isa = PBXGroup;
-			children = (
-				4284B8FE16ADA7F400FB52B4 /* libgameplay.a */,
-				422E8EF4195867F1001DE81F /* libBulletCollision.a */,
-				422E8EF5195867F1001DE81F /* libBulletDynamics.a */,
-				422E8EF6195867F1001DE81F /* libLinearMath.a */,
-				42512C7C17FB424000373866 /* liblua.a */,
-				42512C7D17FB424000373866 /* libpng.a */,
-				42512C7E17FB424000373866 /* libogg.a */,
-				42512C7F17FB424000373866 /* libvorbis.a */,
-				42DFAB2F16AD8CA20000F342 /* libz.dylib */,
-			);
-			name = iOS;
-			sourceTree = "<group>";
-		};
-		42DFAB2E16AD8C8C0000F342 /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-				4284B8FC16ADA7DF00FB52B4 /* libgameplay.a */,
-				42E0D23C195531E100C99DA8 /* libBulletCollision.a */,
-				42E0D23D195531E100C99DA8 /* libBulletDynamics.a */,
-				42E0D23E195531E100C99DA8 /* libLinearMath.a */,
-				42B7025F15B0A8D5002BB8C3 /* liblua.a */,
-				421A5DFA17FE6B0B00A6AA7C /* libpng.a */,
-				42CD0EEF147D932B0000361E /* libogg.a */,
-				42CD0EF0147D932B0000361E /* libvorbis.a */,
-				42CCD557146EC22900353661 /* libz.dylib */,
-			);
-			name = MacOSX;
-			sourceTree = "<group>";
-		};
 		5B43D1B914C35A7A008A5D9D /* iOS */ = {
 			isa = PBXGroup;
 			children = (