diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua index 9f34637f24..ea8241a3c0 100644 --- a/build/premake/extern_libs5.lua +++ b/build/premake/extern_libs5.lua @@ -14,7 +14,11 @@ else -- No Unix-specific libs yet (use source directory instead!) end -- directory for shared, bundled libraries -libraries_source_dir = rootdir.."/libraries/source/" +if os.istarget("windows") then + libraries_source_dir = rootdir.."/libraries/win32/" +else + libraries_source_dir = rootdir.."/libraries/source/" +end third_party_source_dir = rootdir.."/source/third_party/" local function add_default_lib_paths(extern_lib) diff --git a/libraries/get-windows-libs.bat b/libraries/get-windows-libs.bat index b6531e6cdd..807d810a7e 100644 --- a/libraries/get-windows-libs.bat +++ b/libraries/get-windows-libs.bat @@ -1,24 +1,11 @@ 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=28207" +rem **SVN revision to checkout for windows-libs** +rem **Update this line when you commit an update to windows-libs** +set "svnrev=28209" -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 -) +svn co https://svn.wildfiregames.com/public/windows-libs/trunk@%svnrev% 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\)