diff --git a/build/workspaces/update-workspaces.bat b/build/workspaces/update-workspaces.bat index 6fadf2f3d5..ee8cc9ee12 100644 --- a/build/workspaces/update-workspaces.bat +++ b/build/workspaces/update-workspaces.bat @@ -2,5 +2,5 @@ rem ** Create Visual Studio Workspaces on Windows ** cd ..\premake -if not exist ..\workspaces\vs2017\SKIP_PREMAKE_HERE premake5\bin\release\premake5 --outpath="../workspaces/vs2017" --use-shared-glooxwrapper %* vs2017 +if not exist ..\workspaces\vs2017\SKIP_PREMAKE_HERE premake5\bin\release\premake5 --outpath="../workspaces/vs2017" --build-shared-glooxwrapper %* vs2017 cd ..\workspaces diff --git a/libraries/LICENSE.txt b/libraries/LICENSE.txt index 9c91fd9874..7c1a0b57d3 100644 --- a/libraries/LICENSE.txt +++ b/libraries/LICENSE.txt @@ -1,9 +1,12 @@ -This directory contains libraries that are used by the game: +This directory holds libraries that are used by the game. +Libraries are downloaded by running the correct script for your platform. osx/ contains a script for download and building required libraries on OS X. source/ contains bundled source, when the game requires a specific library version that may not be available in package managers. -win32/ contains headers and precompiled static libs for Windows builds. + +get-windows-libs.bat downloads a checkout of headers and precompiled + libraries that we bundle for Windows builds. osx/build-osx-libs.sh MIT diff --git a/libraries/get-windows-libs.bat b/libraries/get-windows-libs.bat new file mode 100644 index 0000000000..bb25c653f9 --- /dev/null +++ b/libraries/get-windows-libs.bat @@ -0,0 +1,24 @@ +rem **Download sources and binaries of libraries** + +rem **SVN revision to checkout for source-libs and windows-libs** +rem **Update this line when you commit an update to source-libs or windows-libs** +set "svnrev=28083" + +if exist source\.svn ( + cd source && svn cleanup && svn up -r %svnrev% && cd .. +) else ( + svn co -r %svnrev% https://svn.wildfiregames.com/public/source-libs/trunk source +) + +if exist win32\.svn ( + cd win32 && svn cleanup && svn up -r %svnrev% && cd .. +) else ( + svn co -r %svnrev% https://svn.wildfiregames.com/public/windows-libs/trunk win32 +) + +rem **Copy binaries to binaries/system/** + +copy source\fcollada\bin\* ..\binaries\system\ +copy source\nvtt\bin\* ..\binaries\system\ +copy source\spidermonkey\bin\* ..\binaries\system\ +for /d %%l in (win32\*) do (if exist %%l\bin copy /y %%l\bin\* ..\binaries\system\)