Merge pull request #1710 from seanpaultaylor/next

Next

samples/browser/sample-browser.pro

@@ -119,7 +119,8 @@ macx
 }
 
 win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
-win32: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/../../gameplay/Debug/debug/ -lgameplay
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/../../gameplay/Release/release/ -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
@@ -127,6 +128,6 @@ win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64
 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(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/sample-character.pro

@@ -69,7 +69,8 @@ macx
 }
 
 win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
-win32: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/../../gameplay/Debug/debug/ -lgameplay
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/../../gameplay/Release/release/ -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
@@ -77,7 +78,7 @@ win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64
 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))
+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/sample-racer.pro

@@ -69,7 +69,8 @@ macx
 }
 
 win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
-win32: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/../../gameplay/Debug/debug/ -lgameplay
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/../../gameplay/Release/release/ -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
@@ -77,7 +78,7 @@ win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64
 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))
+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

@@ -68,7 +68,8 @@ macx
 }
 
 win32: DEFINES += WIN32 _WINDOWS _UNICODE UNICODE
-win32: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+win32: CONFIG(debug, debug|release): LIBS += -L$$PWD/../../gameplay/Debug/debug/ -lgameplay
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/../../gameplay/Release/release/ -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
@@ -76,6 +77,6 @@ win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64
 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(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

@@ -68,7 +68,8 @@ macx
 }
 
 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/gameplay/Debug/debug/ -lgameplay
+win32: CONFIG(release, debug|release): LIBS += -L$$PWD/GAMEPLAY_PATH/gameplay/Release/release/ -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
@@ -76,6 +77,6 @@ win32: LIBS += -L"$(ProgramFiles(x86))/Microsoft DirectX SDK (June 2010)/Lib/x64
 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(xcopy ..\GAMEPLAY_PATH\gameplay\res\shaders res\shaders\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(xcopy ..\GAMEPLAY_PATH\gameplay\res\ui res\ui\* /s /y /d$$escape_expand(\n\t))
+win32: QMAKE_POST_LINK += $$quote(copy ..\GAMEPLAY_PATH\gameplay\res\logo_powered_white.png res$$escape_expand(\n\t))