Kaynağa Gözat

Added win32 support for QtCreator

seanpaultaylor 11 yıl önce
ebeveyn
işleme
3289c9ef29

+ 9 - 3
.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,6 +76,7 @@ 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
@@ -95,6 +98,7 @@ 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/racer/Debug
 /samples/racer/DebugMem
@@ -115,6 +119,7 @@ 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/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

+ 10 - 9
gameplay/gameplay.pro

@@ -3,12 +3,12 @@
 # Project created by QtCreator
 #
 #-------------------------------------------------
-
 QT -= core gui
-
 TARGET = gameplay
 TEMPLATE = lib
 CONFIG += staticlib
+CONFIG += c++11
+CONFIG -= qt
 
 SOURCES += src/AbsoluteLayout.cpp \
     src/AIAgent.cpp \
@@ -522,16 +522,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 +544,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

+ 25 - 21
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
@@ -81,29 +77,25 @@ 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: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/linux/x86_64/libgameplay-deps.a
 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/../../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: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/macosx/x86_64/libgameplay-deps.a
+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 +106,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
+macx 
 {
     icon.files = icon.png
     icon.path = Contents/Resources
@@ -129,3 +121,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))

+ 28 - 20
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
@@ -31,29 +27,26 @@ 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: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/linux/x86_64/libgameplay-deps.a
 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/../../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: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/macosx/x86_64/libgameplay-deps.a
+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,7 +57,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: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config game.config$$escape_expand(\n\t))
+macx 
 {
     icon.files = icon.png
     icon.path = Contents/Resources
@@ -78,3 +72,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))

+ 28 - 21
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
@@ -30,30 +27,26 @@ 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: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/linux/x86_64/libgameplay-deps.a
 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/../../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: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/macosx/x86_64/libgameplay-deps.a
+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 +57,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: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../game.dxt.config ../game.config$$escape_expand(\n\t))
-macx
+macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config game.config$$escape_expand(\n\t))
+macx 
 {
     icon.files = icon.png
     icon.path = Contents/Resources
@@ -79,3 +72,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))

+ 24 - 19
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
@@ -31,29 +27,25 @@ 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: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/linux/x86_64/libgameplay-deps.a
 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/../../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: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/macosx/x86_64/libgameplay-deps.a
+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 +70,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))

+ 25 - 20
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
@@ -31,29 +27,25 @@ 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: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/gameplay/Debug/libgameplay.a
+linux: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/lib/linux/x86_64/libgameplay-deps.a
 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/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: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/gameplay/Debug/libgameplay.a
+macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/lib/macosx/x86_64/libgameplay-deps.a
+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 +56,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 +70,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))