浏览代码

Merge pull request #1653 from seanpaultaylor/next

Updated QTCreator project files
Sean Taylor 11 年之前
父节点
当前提交
7a07dd68bc

+ 11 - 63
gameplay/gameplay.pro

@@ -116,6 +116,7 @@ SOURCES += src/AbsoluteLayout.cpp \
     src/Scene.cpp \
     src/Scene.cpp \
     src/SceneLoader.cpp \
     src/SceneLoader.cpp \
     src/ScreenDisplayer.cpp \
     src/ScreenDisplayer.cpp \
+    src/Script.cpp \
     src/ScriptController.cpp \
     src/ScriptController.cpp \
     src/ScriptController.inl \
     src/ScriptController.inl \
     src/ScriptTarget.cpp \
     src/ScriptTarget.cpp \
@@ -168,8 +169,6 @@ SOURCES += src/AbsoluteLayout.cpp \
     src/lua/lua_CameraListener.cpp \
     src/lua/lua_CameraListener.cpp \
     src/lua/lua_CheckBox.cpp \
     src/lua/lua_CheckBox.cpp \
     src/lua/lua_Container.cpp \
     src/lua/lua_Container.cpp \
-    src/lua/lua_ContainerDirection.cpp \
-    src/lua/lua_ContainerScroll.cpp \
     src/lua/lua_Control.cpp \
     src/lua/lua_Control.cpp \
     src/lua/lua_ControlListener.cpp \
     src/lua/lua_ControlListener.cpp \
     src/lua/lua_Curve.cpp \
     src/lua/lua_Curve.cpp \
@@ -207,7 +206,6 @@ SOURCES += src/AbsoluteLayout.cpp \
     src/lua/lua_Mouse.cpp \
     src/lua/lua_Mouse.cpp \
     src/lua/lua_Node.cpp \
     src/lua/lua_Node.cpp \
     src/lua/lua_NodeCloneContext.cpp \
     src/lua/lua_NodeCloneContext.cpp \
-    src/lua/lua_NodeType.cpp \
     src/lua/lua_ParticleEmitter.cpp \
     src/lua/lua_ParticleEmitter.cpp \
     src/lua/lua_Pass.cpp \
     src/lua/lua_Pass.cpp \
     src/lua/lua_PhysicsCharacter.cpp \
     src/lua/lua_PhysicsCharacter.cpp \
@@ -240,13 +238,15 @@ SOURCES += src/AbsoluteLayout.cpp \
     src/lua/lua_Rectangle.cpp \
     src/lua/lua_Rectangle.cpp \
     src/lua/lua_Ref.cpp \
     src/lua/lua_Ref.cpp \
     src/lua/lua_RenderState.cpp \
     src/lua/lua_RenderState.cpp \
-    src/lua/lua_RenderStateAutoBinding.cpp \
     src/lua/lua_RenderStateStateBlock.cpp \
     src/lua/lua_RenderStateStateBlock.cpp \
     src/lua/lua_RenderTarget.cpp \
     src/lua/lua_RenderTarget.cpp \
     src/lua/lua_Scene.cpp \
     src/lua/lua_Scene.cpp \
     src/lua/lua_ScreenDisplayer.cpp \
     src/lua/lua_ScreenDisplayer.cpp \
+    src/lua/lua_Script.cpp \
     src/lua/lua_ScriptController.cpp \
     src/lua/lua_ScriptController.cpp \
     src/lua/lua_ScriptTarget.cpp \
     src/lua/lua_ScriptTarget.cpp \
+    src/lua/lua_ScriptTargetEvent.cpp \
+    src/lua/lua_ScriptTargetEventRegistry.cpp \
     src/lua/lua_Slider.cpp \
     src/lua/lua_Slider.cpp \
     src/lua/lua_SpriteBatch.cpp \
     src/lua/lua_SpriteBatch.cpp \
     src/lua/lua_Technique.cpp \
     src/lua/lua_Technique.cpp \
@@ -361,6 +361,7 @@ HEADERS += src/AbsoluteLayout.h \
     src/Scene.h \
     src/Scene.h \
     src/SceneLoader.h \
     src/SceneLoader.h \
     src/ScreenDisplayer.h \
     src/ScreenDisplayer.h \
+    src/Script.h \
     src/ScriptController.h \
     src/ScriptController.h \
     src/ScriptTarget.h \
     src/ScriptTarget.h \
     src/Slider.h \
     src/Slider.h \
@@ -387,7 +388,6 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_AIAgentListener.h \
     src/lua/lua_AIAgentListener.h \
     src/lua/lua_AIController.h \
     src/lua/lua_AIController.h \
     src/lua/lua_AIMessage.h \
     src/lua/lua_AIMessage.h \
-    src/lua/lua_AIMessageParameterType.h \
     src/lua/lua_AIState.h \
     src/lua/lua_AIState.h \
     src/lua/lua_AIStateListener.h \
     src/lua/lua_AIStateListener.h \
     src/lua/lua_AIStateMachine.h \
     src/lua/lua_AIStateMachine.h \
@@ -395,7 +395,6 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_Animation.h \
     src/lua/lua_Animation.h \
     src/lua/lua_AnimationClip.h \
     src/lua/lua_AnimationClip.h \
     src/lua/lua_AnimationClipListener.h \
     src/lua/lua_AnimationClipListener.h \
-    src/lua/lua_AnimationClipListenerEventType.h \
     src/lua/lua_AnimationController.h \
     src/lua/lua_AnimationController.h \
     src/lua/lua_AnimationTarget.h \
     src/lua/lua_AnimationTarget.h \
     src/lua/lua_AnimationValue.h \
     src/lua/lua_AnimationValue.h \
@@ -403,47 +402,28 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_AudioController.h \
     src/lua/lua_AudioController.h \
     src/lua/lua_AudioListener.h \
     src/lua/lua_AudioListener.h \
     src/lua/lua_AudioSource.h \
     src/lua/lua_AudioSource.h \
-    src/lua/lua_AudioSourceState.h \
     src/lua/lua_BoundingBox.h \
     src/lua/lua_BoundingBox.h \
     src/lua/lua_BoundingSphere.h \
     src/lua/lua_BoundingSphere.h \
     src/lua/lua_Bundle.h \
     src/lua/lua_Bundle.h \
     src/lua/lua_Button.h \
     src/lua/lua_Button.h \
     src/lua/lua_Camera.h \
     src/lua/lua_Camera.h \
     src/lua/lua_CameraListener.h \
     src/lua/lua_CameraListener.h \
-    src/lua/lua_CameraType.h \
     src/lua/lua_CheckBox.h \
     src/lua/lua_CheckBox.h \
     src/lua/lua_Container.h \
     src/lua/lua_Container.h \
-    src/lua/lua_ContainerDirection.h \
-    src/lua/lua_ContainerScroll.h \
     src/lua/lua_Control.h \
     src/lua/lua_Control.h \
-    src/lua/lua_ControlAlignment.h \
-    src/lua/lua_ControlAutoSize.h \
     src/lua/lua_ControlListener.h \
     src/lua/lua_ControlListener.h \
-    src/lua/lua_ControlListenerEventType.h \
-    src/lua/lua_ControlState.h \
     src/lua/lua_Curve.h \
     src/lua/lua_Curve.h \
-    src/lua/lua_CurveInterpolationType.h \
     src/lua/lua_DepthStencilTarget.h \
     src/lua/lua_DepthStencilTarget.h \
-    src/lua/lua_DepthStencilTargetFormat.h \
     src/lua/lua_Effect.h \
     src/lua/lua_Effect.h \
     src/lua/lua_FileSystem.h \
     src/lua/lua_FileSystem.h \
     src/lua/lua_FlowLayout.h \
     src/lua/lua_FlowLayout.h \
     src/lua/lua_Font.h \
     src/lua/lua_Font.h \
-    src/lua/lua_FontFormat.h \
-    src/lua/lua_FontJustify.h \
-    src/lua/lua_FontStyle.h \
-    src/lua/lua_FontText.h \
     src/lua/lua_Form.h \
     src/lua/lua_Form.h \
     src/lua/lua_FrameBuffer.h \
     src/lua/lua_FrameBuffer.h \
     src/lua/lua_Frustum.h \
     src/lua/lua_Frustum.h \
     src/lua/lua_Game.h \
     src/lua/lua_Game.h \
-    src/lua/lua_GameClearFlags.h \
     src/lua/lua_Gamepad.h \
     src/lua/lua_Gamepad.h \
-    src/lua/lua_GamepadButtonMapping.h \
-    src/lua/lua_GamepadGamepadEvent.h \
-    src/lua/lua_GameState.h \
     src/lua/lua_Gesture.h \
     src/lua/lua_Gesture.h \
-    src/lua/lua_GestureGestureEvent.h \
     src/lua/lua_Global.h \
     src/lua/lua_Global.h \
     src/lua/lua_HeightField.h \
     src/lua/lua_HeightField.h \
     src/lua/lua_Image.h \
     src/lua/lua_Image.h \
@@ -452,49 +432,36 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_Joint.h \
     src/lua/lua_Joint.h \
     src/lua/lua_JoystickControl.h \
     src/lua/lua_JoystickControl.h \
     src/lua/lua_Keyboard.h \
     src/lua/lua_Keyboard.h \
-    src/lua/lua_KeyboardKey.h \
-    src/lua/lua_KeyboardKeyEvent.h \
     src/lua/lua_Label.h \
     src/lua/lua_Label.h \
     src/lua/lua_Layout.h \
     src/lua/lua_Layout.h \
-    src/lua/lua_LayoutType.h \
     src/lua/lua_Light.h \
     src/lua/lua_Light.h \
-    src/lua/lua_LightType.h \
     src/lua/lua_Logger.h \
     src/lua/lua_Logger.h \
-    src/lua/lua_LoggerLevel.h \
     src/lua/lua_Material.h \
     src/lua/lua_Material.h \
     src/lua/lua_MaterialParameter.h \
     src/lua/lua_MaterialParameter.h \
     src/lua/lua_MathUtil.h \
     src/lua/lua_MathUtil.h \
     src/lua/lua_Matrix.h \
     src/lua/lua_Matrix.h \
     src/lua/lua_Mesh.h \
     src/lua/lua_Mesh.h \
     src/lua/lua_MeshBatch.h \
     src/lua/lua_MeshBatch.h \
-    src/lua/lua_MeshIndexFormat.h \
     src/lua/lua_MeshPart.h \
     src/lua/lua_MeshPart.h \
-    src/lua/lua_MeshPrimitiveType.h \
     src/lua/lua_MeshSkin.h \
     src/lua/lua_MeshSkin.h \
     src/lua/lua_Model.h \
     src/lua/lua_Model.h \
     src/lua/lua_Mouse.h \
     src/lua/lua_Mouse.h \
-    src/lua/lua_MouseMouseEvent.h \
     src/lua/lua_Node.h \
     src/lua/lua_Node.h \
     src/lua/lua_NodeCloneContext.h \
     src/lua/lua_NodeCloneContext.h \
-    src/lua/lua_NodeType.h \
     src/lua/lua_ParticleEmitter.h \
     src/lua/lua_ParticleEmitter.h \
-    src/lua/lua_ParticleEmitterTextureBlending.h \
     src/lua/lua_Pass.h \
     src/lua/lua_Pass.h \
     src/lua/lua_PhysicsCharacter.h \
     src/lua/lua_PhysicsCharacter.h \
     src/lua/lua_PhysicsCollisionObject.h \
     src/lua/lua_PhysicsCollisionObject.h \
     src/lua/lua_PhysicsCollisionObjectCollisionListener.h \
     src/lua/lua_PhysicsCollisionObjectCollisionListener.h \
-    src/lua/lua_PhysicsCollisionObjectCollisionListenerEventType.h \
     src/lua/lua_PhysicsCollisionObjectCollisionPair.h \
     src/lua/lua_PhysicsCollisionObjectCollisionPair.h \
     src/lua/lua_PhysicsCollisionObjectType.h \
     src/lua/lua_PhysicsCollisionObjectType.h \
     src/lua/lua_PhysicsCollisionShape.h \
     src/lua/lua_PhysicsCollisionShape.h \
     src/lua/lua_PhysicsCollisionShapeDefinition.h \
     src/lua/lua_PhysicsCollisionShapeDefinition.h \
-    src/lua/lua_PhysicsCollisionShapeType.h \
     src/lua/lua_PhysicsConstraint.h \
     src/lua/lua_PhysicsConstraint.h \
     src/lua/lua_PhysicsController.h \
     src/lua/lua_PhysicsController.h \
     src/lua/lua_PhysicsControllerHitFilter.h \
     src/lua/lua_PhysicsControllerHitFilter.h \
     src/lua/lua_PhysicsControllerHitResult.h \
     src/lua/lua_PhysicsControllerHitResult.h \
     src/lua/lua_PhysicsControllerListener.h \
     src/lua/lua_PhysicsControllerListener.h \
-    src/lua/lua_PhysicsControllerListenerEventType.h \
     src/lua/lua_PhysicsFixedConstraint.h \
     src/lua/lua_PhysicsFixedConstraint.h \
     src/lua/lua_PhysicsGenericConstraint.h \
     src/lua/lua_PhysicsGenericConstraint.h \
     src/lua/lua_PhysicsGhostObject.h \
     src/lua/lua_PhysicsGhostObject.h \
@@ -508,41 +475,28 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_Plane.h \
     src/lua/lua_Plane.h \
     src/lua/lua_Platform.h \
     src/lua/lua_Platform.h \
     src/lua/lua_Properties.h \
     src/lua/lua_Properties.h \
-    src/lua/lua_PropertiesType.h \
     src/lua/lua_Quaternion.h \
     src/lua/lua_Quaternion.h \
     src/lua/lua_RadioButton.h \
     src/lua/lua_RadioButton.h \
     src/lua/lua_Ray.h \
     src/lua/lua_Ray.h \
     src/lua/lua_Rectangle.h \
     src/lua/lua_Rectangle.h \
     src/lua/lua_Ref.h \
     src/lua/lua_Ref.h \
     src/lua/lua_RenderState.h \
     src/lua/lua_RenderState.h \
-    src/lua/lua_RenderStateAutoBinding.h \
-    src/lua/lua_RenderStateBlend.h \
-    src/lua/lua_RenderStateCullFaceSide.h \
-    src/lua/lua_RenderStateDepthFunction.h \
-    src/lua/lua_RenderStateFrontFace.h \
-    src/lua/lua_RenderStateStateBlock.h \
-    src/lua/lua_RenderStateStencilFunction.h \
-    src/lua/lua_RenderStateStencilOperation.h \
     src/lua/lua_RenderTarget.h \
     src/lua/lua_RenderTarget.h \
     src/lua/lua_Scene.h \
     src/lua/lua_Scene.h \
     src/lua/lua_ScreenDisplayer.h \
     src/lua/lua_ScreenDisplayer.h \
+    src/lua/lua_Script.h \
     src/lua/lua_ScriptController.h \
     src/lua/lua_ScriptController.h \
     src/lua/lua_ScriptTarget.h \
     src/lua/lua_ScriptTarget.h \
+    src/lua/lua_ScriptTargetEvent.h \
+    src/lua/lua_ScriptTargetEventRegistry.h \
     src/lua/lua_Slider.h \
     src/lua/lua_Slider.h \
     src/lua/lua_SpriteBatch.h \
     src/lua/lua_SpriteBatch.h \
     src/lua/lua_Technique.h \
     src/lua/lua_Technique.h \
     src/lua/lua_Terrain.h \
     src/lua/lua_Terrain.h \
-    src/lua/lua_TerrainFlags.h \
     src/lua/lua_TerrainPatch.h \
     src/lua/lua_TerrainPatch.h \
     src/lua/lua_TextBox.h \
     src/lua/lua_TextBox.h \
-    src/lua/lua_TextBoxInputMode.h \
     src/lua/lua_Texture.h \
     src/lua/lua_Texture.h \
-    src/lua/lua_TextureCubeFace.h \
-    src/lua/lua_TextureFilter.h \
-    src/lua/lua_TextureFormat.h \
     src/lua/lua_TextureSampler.h \
     src/lua/lua_TextureSampler.h \
-    src/lua/lua_TextureType.h \
-    src/lua/lua_TextureWrap.h \
     src/lua/lua_Theme.h \
     src/lua/lua_Theme.h \
     src/lua/lua_ThemeSideRegions.h \
     src/lua/lua_ThemeSideRegions.h \
     src/lua/lua_ThemeStyle.h \
     src/lua/lua_ThemeStyle.h \
@@ -559,18 +513,12 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_VertexAttributeBinding.h \
     src/lua/lua_VertexAttributeBinding.h \
     src/lua/lua_VertexFormat.h \
     src/lua/lua_VertexFormat.h \
     src/lua/lua_VertexFormatElement.h \
     src/lua/lua_VertexFormatElement.h \
-    src/lua/lua_VertexFormatUsage.h \
     src/lua/lua_VerticalLayout.h
     src/lua/lua_VerticalLayout.h
 
 
 INCLUDEPATH += $$PWD/../gameplay/src
 INCLUDEPATH += $$PWD/../gameplay/src
-INCLUDEPATH += $$PWD/../external-deps/bullet/include
-INCLUDEPATH += $$PWD/../external-deps/lua/include
-INCLUDEPATH += $$PWD/../external-deps/png/include
-INCLUDEPATH += $$PWD/../external-deps/zlib/include
-INCLUDEPATH += $$PWD/../external-deps/ogg/include
-INCLUDEPATH += $$PWD/../external-deps/vorbis/include
-INCLUDEPATH += $$PWD/../external-deps/openal/include
-linux:!android:!android: INCLUDEPATH += $$PWD/../external-deps/glew/include
+INCLUDEPATH += $$PWD/../external-deps/include
+INCLUDEPATH += $$PWD/../external-deps/include/bullet
+
 linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
 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/lib/x86_64-linux-gnu/gtk-2.0/include
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0

+ 5 - 30
samples/browser/sample-browser.pro

@@ -62,14 +62,9 @@ HEADERS += src/Audio3DSample.h \
     src/WaterSample.h
     src/WaterSample.h
 
 
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../gameplay/src
-INCLUDEPATH += $$PWD/../../external-deps/bullet/include
-INCLUDEPATH += $$PWD/../../external-deps/lua/include
-INCLUDEPATH += $$PWD/../../external-deps/png/include
-INCLUDEPATH += $$PWD/../../external-deps/zlib/include
-INCLUDEPATH += $$PWD/../../external-deps/ogg/include
-INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
-INCLUDEPATH += $$PWD/../../external-deps/openal/include
-linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+INCLUDEPATH += $$PWD/../../external-deps/include
+INCLUDEPATH += $$PWD/../../external-deps/include/bullet
+
 linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
 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/lib/x86_64-linux-gnu/gtk-2.0/include
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
@@ -83,23 +78,13 @@ 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/pixman-1
 linux:!android: INCLUDEPATH += /usr/include/libpng12
 linux:!android: INCLUDEPATH += /usr/include/libpng12
 linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 linux:!android: INCLUDEPATH += /usr/include/harfbuzz
-DEPENDPATH += INCLUDEPATH
 
 
 linux:!android: DEFINES += GP_USE_GAMEPAD
 linux:!android: DEFINES += GP_USE_GAMEPAD
 linux:!android: DEFINES += __linux__
 linux:!android: DEFINES += __linux__
 linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
 
 linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
 linux:!android: LIBS += -lm
 linux:!android: LIBS += -lm
 linux:!android: LIBS += -lGL
 linux:!android: LIBS += -lGL
 linux:!android: LIBS += -lrt
 linux:!android: LIBS += -lrt
@@ -111,18 +96,8 @@ linux:!android: LIBS += -lglib-2.0
 linux:!android: LIBS += -lgobject-2.0
 linux:!android: LIBS += -lgobject-2.0
 
 
 linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.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/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(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/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-

+ 5 - 29
samples/character/sample-character.pro

@@ -14,14 +14,9 @@ SOURCES += src/CharacterGame.cpp
 HEADERS += src/CharacterGame.h 
 HEADERS += src/CharacterGame.h 
 
 
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../gameplay/src
-INCLUDEPATH += $$PWD/../../external-deps/bullet/include
-INCLUDEPATH += $$PWD/../../external-deps/lua/include
-INCLUDEPATH += $$PWD/../../external-deps/png/include
-INCLUDEPATH += $$PWD/../../external-deps/zlib/include
-INCLUDEPATH += $$PWD/../../external-deps/ogg/include
-INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
-INCLUDEPATH += $$PWD/../../external-deps/openal/include
-linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+INCLUDEPATH += $$PWD/../../external-deps/include
+INCLUDEPATH += $$PWD/../../external-deps/include/bullet
+
 linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
 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/lib/x86_64-linux-gnu/gtk-2.0/include
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
@@ -35,23 +30,13 @@ 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/pixman-1
 linux:!android: INCLUDEPATH += /usr/include/libpng12
 linux:!android: INCLUDEPATH += /usr/include/libpng12
 linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 linux:!android: INCLUDEPATH += /usr/include/harfbuzz
-DEPENDPATH += INCLUDEPATH
 
 
 linux:!android: DEFINES += GP_USE_GAMEPAD
 linux:!android: DEFINES += GP_USE_GAMEPAD
 linux:!android: DEFINES += __linux__
 linux:!android: DEFINES += __linux__
 linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
 
 linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
 linux:!android: LIBS += -lm
 linux:!android: LIBS += -lm
 linux:!android: LIBS += -lGL
 linux:!android: LIBS += -lGL
 linux:!android: LIBS += -lrt
 linux:!android: LIBS += -lrt
@@ -63,16 +48,7 @@ linux:!android: LIBS += -lglib-2.0
 linux:!android: LIBS += -lgobject-2.0
 linux:!android: LIBS += -lgobject-2.0
 
 
 linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.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/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(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))

+ 0 - 9
samples/lua/game.config

@@ -1,9 +0,0 @@
-window
-{
-    title = Lua
-    width = 1280
-    height = 720
-    fullscreen = false
-}
-
-script = res/game.lua

+ 0 - 68
samples/lua/res/ai.lua

@@ -1,68 +0,0 @@
-
-local this = nil
-local animations = { }
-
-function attached(node)
-    this = node
-
-    -- Create an AIAgent for the box
-    node:setAgent(AIAgent.create())
-
-    -- Get state machine
-    local stateMachine = node:getAgent():getStateMachine()
-
-    -- Register AI states
-    stateMachine:addState("idle")
-    stateMachine:addState("spin")
-    stateMachine:addState("slide")
-    stateMachine:addState("bounce")
-    stateMachine:addState("scale")
-
-    -- Set initial state
-    stateMachine:setState("spin")
-
-    -- Create animations, storing them in a table keyed on state name
-    animations["slide"] = node:createAnimation("slide", Transform.ANIMATE_TRANSLATE(), 6, { 0, 250, 750, 1250, 1750, 2000 }, { 0,0,0, 2,0,0, 2,0,-4, -2,0,-4, -2,0,0, 0,0,0 }, Curve.LINEAR):getClip()
-    animations["slide"]:setRepeatCount(AnimationClip.REPEAT_INDEFINITE())
-    animations["bounce"] = node:createAnimation("bounce", Transform.ANIMATE_TRANSLATE_Y(), 3, { 0, 500, 1000 }, { 0, 0.75, 0 }, Curve.CUBIC_IN_OUT):getClip()
-    animations["bounce"]:setRepeatCount(AnimationClip.REPEAT_INDEFINITE())
-    animations["scale"] = node:createAnimation("scale", Transform.ANIMATE_SCALE(), 3, { 0, 750, 1500 }, { 1,1,1, 2,2,2, 1,1,1 }, Curve.QUADRATIC_IN_OUT):getClip()
-    animations["scale"]:setRepeatCount(AnimationClip.REPEAT_INDEFINITE())
-end
-
-function stateEnter(node, state)
-    local clip = animations[state:getId()]
-    if clip then
-        clip:play()
-    end
-end
-
-function stateExit(node, state)
-    local clip = animations[state:getId()]
-    if clip then
-        clip:pause()
-    end
-end
-
-function stateUpdate(node, state, t)
-    if state:getId() == "spin" then
-        node:rotateY(t * math.rad(0.05))
-    end
-end
-
--- Put into the global table so it can be called by game.lua to toggle AI state
-function _G.toggleState()
-    local stateMachine = this:getAgent():getStateMachine()
-    local state = stateMachine:getActiveState():getId()
-    if state == "spin" then
-        stateMachine:setState("slide")
-    elseif state == "slide" then
-        stateMachine:setState("bounce")
-    elseif state == "bounce" then
-        stateMachine:setState("scale")
-    elseif state == "scale" then
-        stateMachine:setState("idle")
-    elseif state == "idle" then
-        stateMachine:setState("spin")
-    end
-end

+ 0 - 183
samples/lua/res/game.lua

@@ -1,183 +0,0 @@
-
--- Allocate objects to void creating each frame
-local textColor = Vector4.new(0, 0.5, 1, 1)
-
-function initialize()
-
-    Game.setVsync(false)
-
-    -- Display splash screen for at least 1 second.
-    ScreenDisplayer.start("drawSplash", 1000)
-
-    _touched = false
-    _touchX = 0
-
-    -- Load font
-    _font = Font.create("res/ui/arial.gpb")
-
-    -- Load mesh/scene from file
-    _scene = Scene.load("res/lua.scene")
-
-    -- Get the box node
-    _modelNode = _scene:findNode("box")
-
-    -- Find the light node
-    local lightNode = _scene:findNode("directionalLight1")
-
-    -- Bind the light node's direction into the box material.
-    _modelNode:getModel():getMaterial():getParameter("u_directionalLightColor[0]"):setValue(lightNode:getLight():getColor())
-    _modelNode:getModel():getMaterial():getParameter("u_directionalLightDirection[0]"):bindValue(lightNode, "&Node::getForwardVectorWorld")
-
-    -- Update the aspect ratio for our scene's camera to match the current device resolution
-    local game = Game.getInstance()
-    _scene:getActiveCamera():setAspectRatio(game:getWidth() / game:getHeight())
-
-    -- Create the grid and add it to the scene.
-    local model = createGridModel()
-    _scene:addNode("grid"):setModel(model)
-
-    ScreenDisplayer.finish()
-end
-
-function update(t)
-    -- Uncomment the line below to force a more stable and deterministic frame rate, to prevent occassional large garbage collections
-    --collectgarbage()
-end
-
-function render()
-    -- Clear the color and depth buffers.
-    Game.getInstance():clear(Game.CLEAR_COLOR_DEPTH, Vector4.zero(), 1.0, 0)
-
-    -- Visit all the nodes in the scene, drawing the models/mesh.
-    _scene:visit("drawScene")
-
-    -- Draw the fps.
-    local buffer = string.format("%u\n%s", Game.getInstance():getFrameRate(), _modelNode:getAgent():getStateMachine():getActiveState():getId())
-    _font:start()
-    _font:drawText(buffer, 5, 1, textColor, 18)
-    _font:finish()
-end
-
-function finalize()
-    _font = nil
-    _scene = nil
-end
-
-function drawScene(node)
-    local model = node:getModel()
-    if model then
-        model:draw()
-    end
-    return true
-end
-
-function drawSplash()
-    local game = Game.getInstance()
-    game:clear(Game.CLEAR_COLOR_DEPTH, 0, 0, 0, 1, 1.0, 0)
-    local batch = SpriteBatch.create("res/logo_powered_white.png")
-    batch:start()
-    batch:draw(game:getWidth() * 0.5, game:getHeight() * 0.5, 0.0, 512.0, 512.0, 0.0, 1.0, 1.0, 0.0, Vector4.one(), true)
-    batch:finish()
-end
-
-function keyEvent(evt, key)
-    if evt == Keyboard.KEY_PRESS then
-        if key == Keyboard.KEY_ESCAPE then
-            Game.getInstance():exit()
-        end
-    end
-end
-
-function touchEvent(evt, x, y, contactIndex)
-    if evt == Touch.TOUCH_PRESS then
-        _touchTime = Game.getAbsoluteTime()
-        _touched = true
-        _touchX = x
-    elseif evt == Touch.TOUCH_RELEASE then
-        _touched = false
-        _touchX = 0
-
-        -- Basic emulation of tap to change state
-        if (Game.getAbsoluteTime() - _touchTime) < 200 then
-            toggleState()
-        end
-    elseif evt == Touch.TOUCH_MOVE then
-        local deltaX = x - _touchX
-        _touchX = x
-        _modelNode:rotateY(math.rad(deltaX * 0.5))
-    end    
-end
-
-function createGridModel()
-    local lineCount = 41
-    local pointCount = lineCount * 4
-    local verticesSize = pointCount * (3 + 3)
-
-    local vertices = {}
-    local gridLength = math.floor(lineCount / 2)
-    local value = -gridLength
-
-    while #vertices + 1 < verticesSize do
-        -- Default line color is dark grey
-        local red, green, blue = 0.3, 0.3, 0.3
-
-        -- Every 10th line is brighter grey
-        if math.floor(value + 0.5) % 10 == 0 then
-            red, green, blue = 0.45, 0.45, 0.45
-        end
-        -- The Z axis is blue
-        if value == 0 then
-            red, green, blue = 0.15, 0.15, 0.7
-        end
-
-        -- Build the lines
-        vertices[#vertices+1] = value
-        vertices[#vertices+1] = 0.0
-        vertices[#vertices+1] = -gridLength
-        vertices[#vertices+1] = red
-        vertices[#vertices+1] = green
-        vertices[#vertices+1] = blue
-
-        vertices[#vertices+1] = value
-        vertices[#vertices+1] = 0.0
-        vertices[#vertices+1] = gridLength
-        vertices[#vertices+1] = red
-        vertices[#vertices+1] = green
-        vertices[#vertices+1] = blue
-
-        -- The X axis is red
-        if value == 0.0 then
-            red, green, blue = 0.7, 0.15, 0.15
-        end
-        vertices[#vertices+1] = -gridLength
-        vertices[#vertices+1] = 0.0
-        vertices[#vertices+1] = value
-        vertices[#vertices+1] = red
-        vertices[#vertices+1] = green
-        vertices[#vertices+1] = blue
-
-        vertices[#vertices+1] = gridLength
-        vertices[#vertices+1] = 0.0
-        vertices[#vertices+1] = value
-        vertices[#vertices+1] = red
-        vertices[#vertices+1] = green
-        vertices[#vertices+1] = blue
-
-        value = value + 1.0
-    end
-
-    local elements = { 
-        VertexFormat.Element.new(VertexFormat.POSITION, 3),
-        VertexFormat.Element.new(VertexFormat.COLOR, 3)
-    }
-    local mesh = Mesh.createMesh(VertexFormat.new(elements, 2), pointCount, false)
-    if mesh == nil then
-        return nil, "Error creating grid mesh."
-    end
-    mesh:setPrimitiveType(Mesh.LINES)
-    mesh:setVertexData(vertices, 0, pointCount)
-
-    local model = Model.create(mesh)
-    model:setMaterial("res/lua.material#grid")
-    return model
-end

+ 0 - 10
samples/lua/res/lua.scene

@@ -1,10 +0,0 @@
-scene
-{
-    path = res/lua.gpb
-    
-    node box
-    {
-        material = res/lua.material
-        script = res/ai.lua
-    }
-}

+ 0 - 195
samples/lua/sample-lua.vcxproj

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugMem|x64">
-      <Configuration>DebugMem</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>sample-lua</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Configuration)\</OutDir>
-    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <CustomBuildBeforeTargets />
-    <IntDir>$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(Configuration)\</OutDir>
-    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <CustomBuildBeforeTargets />
-    <IntDir>$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(Configuration)\</OutDir>
-    <CustomBuildBeforeTargets />
-    <IntDir>$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\gameplay\src;..\..\external-deps\include;..\..\external-deps\include\bullet</AdditionalIncludeDirectories>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>OpenGL32.lib;GLU32.lib;gameplay.lib;gameplay-deps.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\external-deps\libs\Windows\x86_64\Debug;..\..\gameplay\windows\x64\Debug</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-      <Message>
-      </Message>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent>
-      <Command>xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d
-xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d
-copy ..\..\gameplay\res\logo_powered_white.png res</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugMem|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;GP_USE_MEM_LEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\gameplay\src;..\..\external-deps\include;..\..\external-deps\include\bullet</AdditionalIncludeDirectories>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <ShowIncludes>false</ShowIncludes>
-      <PreprocessToFile>false</PreprocessToFile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>OpenGL32.lib;GLU32.lib;gameplay.lib;gameplay-deps.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\external-deps\libs\Windows\x86_64\Debug;..\..\gameplay\windows\x64\DebugMem</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-      <Message>
-      </Message>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent>
-      <Command>xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d
-xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d
-copy ..\..\gameplay\res\logo_powered_white.png res</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\gameplay\src;..\..\external-deps\include;..\..\external-deps\include\bullet</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>OpenGL32.lib;GLU32.lib;gameplay.lib;gameplay-deps.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\external-deps\libs\Windows\x86_64\Release;..\..\gameplay\windows\x64\Release</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Command>
-      </Command>
-      <Message>
-      </Message>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <PreBuildEvent>
-      <Command>xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d
-xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d
-copy ..\..\gameplay\res\logo_powered_white.png res</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="bar-descriptor.xml">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="game.config" />
-    <None Include="icon.png" />
-    <None Include="res\ai.lua" />
-    <None Include="res\game.lua" />
-    <None Include="res\lua.fbx" />
-    <None Include="res\lua.gpb" />
-    <None Include="res\lua.material" />
-    <None Include="res\lua.mb" />
-    <None Include="res\lua.scene" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\LuaGame.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="res\lua-logo.png" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

+ 0 - 48
samples/lua/sample-lua.vcxproj.filters

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="res">
-    </Filter>
-    <Filter Include="src">
-    </Filter>
-    <Filter Include="res\shaders">
-      <UniqueIdentifier>{68243144-f027-4318-bbef-5f0e62ae5e82}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="icon.png" />
-    <None Include="bar-descriptor.xml" />
-    <None Include="game.config" />
-    <None Include="res\ai.lua">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\game.lua">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.gpb">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.material">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.mb">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.scene">
-      <Filter>res</Filter>
-    </None>
-    <None Include="res\lua.fbx">
-      <Filter>res</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\LuaGame.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="res\lua-logo.png">
-      <Filter>res</Filter>
-    </Image>
-  </ItemGroup>
-</Project>

+ 0 - 4
samples/lua/src/LuaGame.cpp

@@ -1,4 +0,0 @@
-#include "gameplay.h"
-
-// Declare our game instance
-gameplay::Game game;

+ 5 - 29
samples/racer/sample-racer.pro

@@ -14,14 +14,9 @@ SOURCES += src/RacerGame.cpp
 HEADERS += src/RacerGame.h 
 HEADERS += src/RacerGame.h 
 
 
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../gameplay/src
-INCLUDEPATH += $$PWD/../../external-deps/bullet/include
-INCLUDEPATH += $$PWD/../../external-deps/lua/include
-INCLUDEPATH += $$PWD/../../external-deps/png/include
-INCLUDEPATH += $$PWD/../../external-deps/zlib/include
-INCLUDEPATH += $$PWD/../../external-deps/ogg/include
-INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
-INCLUDEPATH += $$PWD/../../external-deps/openal/include
-linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+INCLUDEPATH += $$PWD/../../external-deps/include
+INCLUDEPATH += $$PWD/../../external-deps/include/bullet
+
 linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
 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/lib/x86_64-linux-gnu/gtk-2.0/include
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
@@ -35,23 +30,13 @@ 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/pixman-1
 linux:!android: INCLUDEPATH += /usr/include/libpng12
 linux:!android: INCLUDEPATH += /usr/include/libpng12
 linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 linux:!android: INCLUDEPATH += /usr/include/harfbuzz
-DEPENDPATH += INCLUDEPATH
 
 
 linux:!android: DEFINES += GP_USE_GAMEPAD
 linux:!android: DEFINES += GP_USE_GAMEPAD
 linux:!android: DEFINES += __linux__
 linux:!android: DEFINES += __linux__
 linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
 
 linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
 linux:!android: LIBS += -lm
 linux:!android: LIBS += -lm
 linux:!android: LIBS += -lGL
 linux:!android: LIBS += -lGL
 linux:!android: LIBS += -lrt
 linux:!android: LIBS += -lrt
@@ -63,16 +48,7 @@ linux:!android: LIBS += -lglib-2.0
 linux:!android: LIBS += -lgobject-2.0
 linux:!android: LIBS += -lgobject-2.0
 
 
 linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.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/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(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))

+ 5 - 28
samples/spaceship/sample-spaceship.pro

@@ -14,14 +14,9 @@ SOURCES += src/SpaceshipGame.cpp
 HEADERS += src/SpaceshipGame.h 
 HEADERS += src/SpaceshipGame.h 
 
 
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../gameplay/src
-INCLUDEPATH += $$PWD/../../external-deps/bullet/include
-INCLUDEPATH += $$PWD/../../external-deps/lua/include
-INCLUDEPATH += $$PWD/../../external-deps/png/include
-INCLUDEPATH += $$PWD/../../external-deps/zlib/include
-INCLUDEPATH += $$PWD/../../external-deps/ogg/include
-INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
-INCLUDEPATH += $$PWD/../../external-deps/openal/include
-linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+INCLUDEPATH += $$PWD/../../external-deps/include
+INCLUDEPATH += $$PWD/../../external-deps/include/bullet
+
 linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
 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/lib/x86_64-linux-gnu/gtk-2.0/include
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
 linux:!android: INCLUDEPATH += /usr/include/atk-1.0
@@ -42,16 +37,7 @@ linux:!android: DEFINES += __linux__
 linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
 
 linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -L$$PWD/../../external-deps/libs/Linux/x86_64/ -lgameplay-deps
 linux:!android: LIBS += -lm
 linux:!android: LIBS += -lm
 linux:!android: LIBS += -lGL
 linux:!android: LIBS += -lGL
 linux:!android: LIBS += -lrt
 linux:!android: LIBS += -lrt
@@ -63,16 +49,7 @@ linux:!android: LIBS += -lglib-2.0
 linux:!android: LIBS += -lgobject-2.0
 linux:!android: LIBS += -lgobject-2.0
 
 
 linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.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/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(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))