Merge pull request #1709 from seanpaultaylor/next

Next

.gitignore

@@ -8,10 +8,8 @@
 ehthumbs.db
 Icon?
 Thumbs.db
-/.metadata
+.metadata
 .settings
-/169.254.0.1
-/usb
 /ipch
 /build
 /cmake
@@ -21,6 +19,9 @@ Thumbs.db
 /bin
 /external-deps
 /api/html
+Makefile
+Makefile.Debug
+Makefile.Release
 gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 
 /gameplay/Debug
@@ -36,6 +37,7 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /gameplay/android/obj
 /gameplay.xcworkspace/xcuserdata
 /gameplay/gameplay.xcodeproj/xcuserdata
+/gameplay/gameplay.vcxproj.user
 
 /tools/encoder
 /tools/encoder/Debug
@@ -74,11 +76,11 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/browser/android/local.properties
 /samples/browser/android/proguard-project.txt
 /samples/browser/sample-browser.xcodeproj/xcuserdata
+/samples/browser/sample-browser.vcxproj.user
 
 /samples/character/Debug
 /samples/character/DebugMem
 /samples/character/Release
-/samples/character/game.config
 /samples/character/res/shaders
 /samples/character/res/ui
 /samples/character/res/logo_powered_white.png
@@ -95,11 +97,12 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/character/android/proguard.cfg
 /samples/character/res/gamepad.xcf
 /samples/character/sample-character.xcodeproj/xcuserdata
+/samples/character/sample-character.vcxproj.user
+/samples/character/game.config
 
 /samples/racer/Debug
 /samples/racer/DebugMem
 /samples/racer/Release
-/samples/racer/game.config
 /samples/racer/res/shaders
 /samples/racer/res/ui
 /samples/racer/res/logo_powered_white.png
@@ -115,6 +118,8 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/racer/android/proguard-project.txt
 /samples/racer/android/proguard.cfg
 /samples/racer/sample-racer.xcodeproj/xcuserdata
+/samples/racer/sample-racer.vcxproj.user
+/samples/racer/game.config
 
 /samples/spaceship/Debug
 /samples/spaceship/DebugMem
@@ -134,3 +139,4 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/spaceship/android/proguard.cfg
 /samples/spaceship/android/proguard-project.txt
 /samples/spaceship/sample-spaceship.xcodeproj/xcuserdata
+/samples/spaceship/sample-spaceship.vcxproj.user

gameplay/gameplay.pro

@@ -3,12 +3,14 @@
 # Project created by QtCreator
 #
 #-------------------------------------------------
-
 QT -= core gui
-
 TARGET = gameplay
 TEMPLATE = lib
 CONFIG += staticlib
+CONFIG += c++11
+CONFIG -= qt
+
+#DEFINES += GP_NO_PLATFORM
 
 SOURCES += src/AbsoluteLayout.cpp \
     src/AIAgent.cpp \
@@ -522,16 +524,13 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_VertexFormatElement.h \
     src/lua/lua_VerticalLayout.h
 
-CONFIG += c++11
-
 INCLUDEPATH += $$PWD/../gameplay/src
 INCLUDEPATH += $$PWD/../external-deps/include
+DEFINES += GP_USE_GAMEPAD
 
-# linux
 linux: SOURCES += src/PlatformLinux.cpp
 linux: SOURCES += src/gameplay-main-linux.cpp
 linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
-linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
 linux: INCLUDEPATH += /usr/include/gtk-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
@@ -547,16 +546,20 @@ 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++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: DEFINES += GP_USE_GAMEPAD
-macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/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
+
+win32: SOURCES += src/PlatformWindows.cpp
+win32: SOURCES += src/gameplay-main-windows.cpp
+win32: DEFINES += WIN32 _UNICODE UNICODE
+win32: INCLUDEPATH += "$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Include"
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34100
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34189

gameplay/src/PlatformAndroid.cpp

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef __ANDROID__
 
 #include "Base.h"
@@ -1787,4 +1788,5 @@ JNIEXPORT void JNICALL Java_org_gameplay3d_GamePlayNativeActivity_screenOrientat
 }
 
 #endif
+#endif
 

gameplay/src/PlatformLinux.cpp

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef __linux__
 
 #include "Base.h"
@@ -1745,3 +1746,4 @@ std::string Platform::displayFileDialog(size_t mode, const char* title, const ch
 }
 
 #endif
+#endif

gameplay/src/PlatformMacOSX.mm

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef __APPLE__
 
 #include "Base.h"
@@ -2391,3 +2392,4 @@ std::string Platform::displayFileDialog(size_t mode, const char* title, const ch
 }
 
 #endif
+#endif

gameplay/src/PlatformWindows.cpp

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef WIN32
 
 #include "Base.h"
@@ -1437,3 +1438,4 @@ std::string Platform::displayFileDialog(size_t mode, const char* title, const ch
 }
 
 #endif
+#endif

gameplay/src/PlatformiOS.mm

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef __APPLE__
 
 #include "Base.h"
@@ -1730,3 +1731,4 @@ std::string Platform::displayFileDialog(size_t mode, const char* title, const ch
 }
 
 #endif
+#endif

gameplay/src/ScriptController.cpp

@@ -2,7 +2,7 @@
 #include "FileSystem.h"
 #include "ScriptController.h"
 
-#ifndef NO_LUA_BINDINGS
+#ifndef GP_NO_LUA_BINDINGS
 #include "lua/lua_all_bindings.h"
 #endif
 
@@ -716,7 +716,7 @@ void ScriptController::initialize()
         GP_ERROR("Failed to initialize Lua scripting engine.");
     luaL_openlibs(_lua);
 
-#ifndef NO_LUA_BINDINGS
+#ifndef GP_NO_LUA_BINDINGS
     lua_RegisterAllBindings();
     ScriptUtil::registerFunction("convert", ScriptController::convert);
 #endif

gameplay/src/gameplay-main-android.cpp

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef __ANDROID__
 
 #include <android_native_app_glue.h>
@@ -29,3 +30,4 @@ void android_main(struct android_app* state)
 }
 
 #endif
+#endif

gameplay/src/gameplay-main-ios.mm

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef __APPLE__
 
 #import <Foundation/Foundation.h>
@@ -26,3 +27,4 @@ int main(int argc, char** argv)
 }
 
 #endif
+#endif

gameplay/src/gameplay-main-linux.cpp

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef __linux__
 
 #include "gameplay.h"
@@ -23,3 +24,4 @@ int main(int argc, char** argv)
 }
 
 #endif
+#endif

gameplay/src/gameplay-main-macosx.mm

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef __APPLE__
 
 #import <Foundation/Foundation.h>
@@ -25,4 +26,5 @@ int main(int argc, char** argv)
     return result;
 }
 
+#endif
 #endif

gameplay/src/gameplay-main-windows.cpp

@@ -1,3 +1,4 @@
+#ifndef GP_NO_PLATFORM
 #ifdef WIN32
 
 #include "gameplay.h"
@@ -23,3 +24,4 @@ extern "C" int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LP
 }
 
 #endif
+#endif

samples/browser/sample-browser.pro

@@ -3,11 +3,11 @@
 # Project created by QtCreator
 #
 #-------------------------------------------------
-
 QT -= core gui
-
 TARGET = sample-browser
 TEMPLATE = app
+CONFIG += c++11
+CONFIG -= qt
 
 SOURCES += src/Audio3DSample.cpp \
     src/AudioSample.cpp \
@@ -63,16 +63,12 @@ HEADERS += src/Audio3DSample.h \
     src/TriangleSample.h \
     src/WaterSample.h
 
-CONFIG += c++11
-
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
-LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-
-linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
-linux: DEFINES += GP_USE_GAMEPAD
+DEFINES += GP_USE_GAMEPAD
+    
 linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -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
@@ -86,24 +82,16 @@ 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/../../gameplay/Debug/ -lgameplay
 linux: LIBS += -L$$PWD/../../external-deps/lib/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/lib/linux/x86_64/libgameplay-deps.a
+linux: LIBS += -lm -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0
 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++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: DEFINES += GP_USE_GAMEPAD
+macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -114,7 +102,8 @@ 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))
-macx
+macx: ICON = icon.png
+macx 
 {
     icon.files = icon.png
     icon.path = Contents/Resources
@@ -129,3 +118,15 @@ macx
     QMAKE_BUNDLE_DATA += res
 }
 
+win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
+win32: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/../../external-deps/lib/windows/x86_64/Debug/ -lgameplay-deps
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/../../external-deps/lib/windows/x86_64/Release/ -lgameplay-deps
+win32: LIBS += -lOpenGL32 -lGLU32 -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32
+win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64" -lXInput
+win32: INCLUDEPATH += "$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Include"
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34100
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34189
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(copy ..\..\gameplay\res\logo_powered_white.png res$$escape_expand(\n\t))

samples/character/game.config

@@ -0,0 +1,48 @@
+window
+{
+    title = Character
+    width = 1280
+    height = 720
+    fullscreen = false
+}
+
+aliases
+{
+    backboard = res/dxt/backboard.dds
+    basketball = res/dxt/basketball.dds
+    basketballnet = res/dxt/basketballnet.dds
+    book = res/dxt/book.dds
+    bookshelf = res/dxt/bookshelf.dds
+    character = res/dxt/boy.dds
+    decals = res/dxt/decals.dds
+    door = res/dxt/door.dds
+    doorframe = res/dxt/doorframe.dds
+    easel = res/dxt/easel.dds
+    floor = res/dxt/floor.dds
+    floortiles = res/dxt/floortiles.dds
+    gamepad = res/dxt/gamepad.dds
+    playtable = res/dxt/playtable.dds
+    shadow = res/dxt/shadow.dds
+    storageorganizer = res/dxt/storageorganizer.dds
+    tableleg1 = res/dxt/tableleg1.dds
+    tableleg2 = res/dxt/tableleg2.dds
+    tableleg3 = res/dxt/tableleg3.dds
+    tableleg4 = res/dxt/tableleg4.dds
+    tabletop = res/dxt/tabletop.dds
+    tiles = res/dxt/tiles.dds
+    tilesn = res/dxt/tilesn.dds
+    toybox = res/dxt/toybox.dds
+    walleast = res/dxt/walleast.dds
+    wallnorth = res/dxt/wallnorth.dds
+    walloverhang = res/dxt/walloverhang.dds
+    wallsouth = res/dxt/wallsouth.dds
+    wallwest = res/dxt/wallwest.dds
+    windowledge = res/dxt/windowledge.dds
+    wood = res/dxt/wood.dds
+    woodn = res/dxt/woodn.dds
+}
+
+gamepads
+{
+    form = res/common/gamepad.form
+}

samples/character/sample-character.pro

@@ -3,26 +3,22 @@
 # Project created by QtCreator
 #
 #-------------------------------------------------
-
 QT -= core gui
-
 TARGET = sample-character
 TEMPLATE = app
+CONFIG += c++11
+CONFIG -= qt
 
 SOURCES += src/CharacterGame.cpp
 
 HEADERS += src/CharacterGame.h 
 
-CONFIG += c++11
-
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
-LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+DEFINES += GP_USE_GAMEPAD
 
-linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
-linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -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
@@ -36,24 +32,17 @@ 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/../../gameplay/Debug/ -lgameplay
 linux: LIBS += -L$$PWD/../../external-deps/lib/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/lib/linux/x86_64/libgameplay-deps.a
+linux: LIBS += -lm -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0
 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: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config game.config$$escape_expand(\n\t))
 
 macx: QMAKE_CXXFLAGS += -x c++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: DEFINES += GP_USE_GAMEPAD
+macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -61,7 +50,7 @@ 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_ += $$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))
 macx
@@ -78,3 +67,17 @@ macx
     res.path = Contents/Resources
     QMAKE_BUNDLE_DATA += res
 }
+
+win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
+win32: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/../../external-deps/lib/windows/x86_64/Debug/ -lgameplay-deps
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/../../external-deps/lib/windows/x86_64/Release/ -lgameplay-deps
+win32: LIBS += -lOpenGL32 -lGLU32 -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32
+win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64" -lXInput
+win32: INCLUDEPATH += "$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Include"
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34100
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34189
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(copy ..\..\gameplay\res\logo_powered_white.png res$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(copy /Y game.dxt.config game.config$$escape_expand(\n\t))

samples/racer/game.config

@@ -0,0 +1,72 @@
+window
+{
+    title = Racer
+    width = 1280
+    height = 720
+    fullscreen = false
+}
+
+scripts
+{
+    initialize = res/common/racer.lua#initialize
+    update = res/common/racer.lua#update
+    render = res/common/racer.lua#render
+    finalize = res/common/racer.lua#finalize
+    keyEvent = res/common/racer.lua#keyEvent
+    touchEvent = res/common/racer.lua#touchEvent
+}
+
+aliases 
+{
+    car = res/dxt/car.png
+    chain_fence_1 = res/dxt/chain_fence_1.dds 
+    design_11 = res/dxt/design_11.dds 
+    d_tree = res/dxt/d_tree.dds 
+    gamepad = res/dxt/gamepad.dds 
+    grassbunch_1 = res/dxt/grassbunch_1.dds 
+    grassbunch_2 = res/dxt/grassbunch_2.dds 
+    gravel_2 = res/dxt/gravel_2.dds 
+    panel_1 = res/dxt/panel_1.dds 
+    panel_10 = res/dxt/panel_10.dds 
+    panel_11 = res/dxt/panel_11.dds 
+    panel_12 = res/dxt/panel_12.dds 
+    panel_13 = res/dxt/panel_13.dds 
+    panel_14 = res/dxt/panel_14.dds 
+    panel_15 = res/dxt/panel_15.dds 
+    panel_16 = res/dxt/panel_16.dds 
+    panel_2 = res/dxt/panel_2.dds 
+    panel_3 = res/dxt/panel_3.dds 
+    panel_4 = res/dxt/panel_4.dds 
+    panel_5 = res/dxt/panel_5.dds 
+    panel_6 = res/dxt/panel_6.dds 
+    panel_7 = res/dxt/panel_7.dds 
+    panel_8 = res/dxt/panel_8.dds 
+    panel_9 = res/dxt/panel_9.dds 
+    panorama_2 = res/dxt/panorama_2.dds 
+    panorama_3 = res/dxt/panorama_3.dds 
+    rails = res/dxt/rails.dds 
+    shrub_1 = res/dxt/shrub_1.dds 
+    shrub_2 = res/dxt/shrub_2.dds 
+    shrub_3 = res/dxt/shrub_3.dds 
+    textures_8 = res/dxt/textures_8.dds 
+    track_1 = res/dxt/track_1.dds 
+    tree = res/dxt/tree.dds 
+    tree_2 = res/dxt/tree_2.dds 
+    tree_3 = res/dxt/tree_3.dds 
+    tree_4 = res/dxt/tree_4.dds 
+    tree_5 = res/dxt/tree_5.dds 
+    tree_6 = res/dxt/tree_6.dds 
+    tree_7 = res/dxt/tree_7.dds 
+    trunk_1 = res/dxt/trunk_1.dds 
+    trunk_2 = res/dxt/trunk_2.dds 
+} 
+
+gamepad
+{
+    form = res/common/gamepad.form
+}
+
+ui
+{
+    theme = res/ui/default.theme
+}

samples/racer/sample-racer.pro

@@ -3,25 +3,22 @@
 # Project created by QtCreator
 #
 #-------------------------------------------------
-
 QT -= core gui
-
 TARGET = sample-racer
 TEMPLATE = app
+CONFIG += c++11
+CONFIG -= qt
 
 SOURCES += src/RacerGame.cpp
 
 HEADERS += src/RacerGame.h 
 
-CONFIG += c++11
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
-LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+DEFINES += GP_USE_GAMEPAD
 
-linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
-linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -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
@@ -35,25 +32,17 @@ 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/../../gameplay/Debug/ -lgameplay
 linux: LIBS += -L$$PWD/../../external-deps/lib/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/lib/linux/x86_64/libgameplay-deps.a
+linux: LIBS += -lm -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0
 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: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config ../game.config$$escape_expand(\n\t))
+linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config game.config$$escape_expand(\n\t))
 
 macx: QMAKE_CXXFLAGS += -x c++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: DEFINES += GP_USE_GAMEPAD
+macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -64,8 +53,7 @@ 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))
-macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../game.dxt.config ../game.config$$escape_expand(\n\t))
-macx
+macx 
 {
     icon.files = icon.png
     icon.path = Contents/Resources
@@ -79,3 +67,17 @@ macx
     res.path = Contents/Resources
     QMAKE_BUNDLE_DATA += res
 }
+
+win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
+win32: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/../../external-deps/lib/windows/x86_64/Debug/ -lgameplay-deps
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/../../external-deps/lib/windows/x86_64/Release/ -lgameplay-deps
+win32: LIBS += -lOpenGL32 -lGLU32 -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32
+win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64" -lXInput
+win32: INCLUDEPATH += "$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Include"
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34100
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34189
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(copy ..\..\gameplay\res\logo_powered_white.png res$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(copy /Y game.dxt.config game.config$$escape_expand(\n\t))

samples/spaceship/sample-spaceship.pro

@@ -3,26 +3,22 @@
 # Project created by QtCreator
 #
 #-------------------------------------------------
-
 QT -= core gui
-
 TARGET = sample-spaceship
 TEMPLATE = app
+CONFIG += c++11
+CONFIG -= qt
 
 SOURCES += src/SpaceshipGame.cpp
 
 HEADERS += src/SpaceshipGame.h 
 
-CONFIG += c++11
-
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
-LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+DEFINES += GP_USE_GAMEPAD
 
-linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
-linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -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
@@ -36,24 +32,16 @@ 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/../../gameplay/Debug/ -lgameplay
 linux: LIBS += -L$$PWD/../../external-deps/lib/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/lib/linux/x86_64/libgameplay-deps.a
+linux: LIBS += -lm -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0
 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++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: DEFINES += GP_USE_GAMEPAD
+macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -78,3 +66,16 @@ macx
     res.path = Contents/Resources
     QMAKE_BUNDLE_DATA += res
 }
+
+win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
+win32: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/../../external-deps/lib/windows/x86_64/Debug/ -lgameplay-deps
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/../../external-deps/lib/windows/x86_64/Release/ -lgameplay-deps
+win32: LIBS += -lOpenGL32 -lGLU32 -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32
+win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64" -lXInput
+win32: INCLUDEPATH += "$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Include"
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34100
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34189
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(copy ..\..\gameplay\res\logo_powered_white.png res$$escape_expand(\n\t))

template/TEMPLATE_PROJECT.pro

@@ -3,26 +3,22 @@
 # Project created by QtCreator
 #
 #-------------------------------------------------
-
 QT -= core gui
-
 TARGET = TEMPLATE_PROJECT
 TEMPLATE = app
+CONFIG += c++11
+CONFIG -= qt
 
 SOURCES += src/TemplateGame.cpp
 
 HEADERS += src/TemplateGame.h
 
-CONFIG += c++11
-
 INCLUDEPATH += GAMEPLAY_PATH/gameplay/src
 INCLUDEPATH += GAMEPLAY_PATH/external-deps/include
-LIBS += -L$$PWD/GAMEPLAY_PATH/gameplay/Debug/ -lgameplay
-PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/gameplay/Debug/libgameplay.a
+DEFINES += GP_USE_GAMEPAD
 
-linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
-linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
+linux: QMAKE_CXXFLAGS += -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
@@ -36,24 +32,16 @@ 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/GAMEPLAY_PATH/gameplay/Debug/ -lgameplay
 linux: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/lib/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/GAMEPLAY_PATH/external-deps/lib/linux/x86_64/libgameplay-deps.a
+linux: LIBS += -lm -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0
 linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/GAMEPLAY_PATH/gameplay/res/shaders ../res$$escape_expand(\n\t))
 linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/GAMEPLAY_PATH/gameplay/res/ui ../res$$escape_expand(\n\t))
 linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/GAMEPLAY_PATH/gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
 macx: QMAKE_CXXFLAGS += -x c++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: DEFINES += GP_USE_GAMEPAD
+macx: LIBS += -L$$PWD/GAMEPLAY_PATH/gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -64,7 +52,7 @@ macx: LIBS += -F/System/Library/Frameworks -framework Cocoa
 macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/GAMEPLAY_PATH/gameplay/res/shaders ../res$$escape_expand(\n\t))
 macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/GAMEPLAY_PATH/gameplay/res/ui ../res$$escape_expand(\n\t))
 macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/GAMEPLAY_PATH/gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-macx
+macx 
 {
     icon.files = icon.png
     icon.path = Contents/Resources
@@ -78,3 +66,16 @@ macx
     res.path = Contents/Resources
     QMAKE_BUNDLE_DATA += res
 }
+
+win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
+win32: LIBS += -L$$PWD/GAMEPLAY_PATH/gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/lib/windows/x86_64/Debug/ -lgameplay-deps
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/lib/windows/x86_64/Release/ -lgameplay-deps
+win32: LIBS += -lOpenGL32 -lGLU32 -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32
+win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64" -lXInput
+win32: INCLUDEPATH += "$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Include"
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34100
+win32: QMAKE_CXXFLAGS_WARN_ON -= -w34189
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\shaders res\shaders\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\..\gameplay\res\ui res\ui\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(copy ..\..\gameplay\res\logo_powered_white.png res$$escape_expand(\n\t))