diff options
| author | Jason Maskell <Jason Maskell> | 2016-07-26 16:21:57 +0700 |
|---|---|---|
| committer | Jason Maskell <Jason Maskell> | 2016-07-26 16:21:57 +0700 |
| commit | 9d3f79f7e7e68ca9e296368587ab22494ffaf19b (patch) | |
| tree | eaa4190d763f6504ba5ba91fe367c937406a2a45 /GenerateProjects.bat | |
| parent | Modified finders to take Visual Studio platform into account when finding lib... (diff) | |
| download | waveworks_archive-9d3f79f7e7e68ca9e296368587ab22494ffaf19b.tar.xz waveworks_archive-9d3f79f7e7e68ca9e296368587ab22494ffaf19b.zip | |
Added Packman support - now the GenerateProjects.bat uses Packman to pull dependencies specified in WaveWorksDependencies.xml
Finders of these dependencies are modified to look in the Packman repo.
Diffstat (limited to 'GenerateProjects.bat')
| -rw-r--r-- | GenerateProjects.bat | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/GenerateProjects.bat b/GenerateProjects.bat index cbc826b..1df3d8d 100644 --- a/GenerateProjects.bat +++ b/GenerateProjects.bat @@ -2,22 +2,25 @@ REM @echo off REM Make sure the various variables that we need are set -IF NOT DEFINED GW_DEPS_ROOT GOTO GW_DEPS_ROOT_UNDEFINED +call %~dp0\packman\windows\packman.cmd pull WaveWorksDependencies.xml -REM Generate projects here -rmdir /s /q compiler\vc12win64-cmake\ -mkdir compiler\vc12win64-cmake\ -pushd compiler\vc12win64-cmake\ -cmake ..\.. -G "Visual Studio 12 2013" -Ax64 -DTARGET_BUILD_PLATFORM=Windows -DWW_OUTPUT_DIR=bin\vc12win64-cmake\ -popd +IF NOT DEFINED PM_PACKAGES_ROOT GOTO PM_PACKAGES_ROOT_UNDEFINED + +REM Generate projects here -REM rmdir /s /q compiler\vc14win64-cmake\ -REM mkdir compiler\vc14win64-cmake\ -REM pushd compiler\vc14win64-cmake\ -REM cmake ..\.. -G "Visual Studio 14 2015" -Ax64 -DTARGET_BUILD_PLATFORM=Windows -DWW_OUTPUT_DIR=bin\vc14win64-cmake\ +REM rmdir /s /q compiler\vc12win64-cmake\ +REM mkdir compiler\vc12win64-cmake\ +REM pushd compiler\vc12win64-cmake\ +REM cmake ..\.. -G "Visual Studio 12 2013" -Ax64 -DTARGET_BUILD_PLATFORM=Windows -DWW_OUTPUT_DIR=bin\vc12win64-cmake\ REM popd +rmdir /s /q compiler\vc14win64-cmake\ +mkdir compiler\vc14win64-cmake\ +pushd compiler\vc14win64-cmake\ +cmake ..\.. -G "Visual Studio 14 2015" -Ax64 -DTARGET_BUILD_PLATFORM=Windows -DWW_OUTPUT_DIR=bin\vc14win64-cmake\ +popd + REM rmdir /s /q compiler\vc12-ps4-cmake\ REM mkdir compiler\vc12-ps4-cmake\ REM pushd compiler\vc12-ps4-cmake\ @@ -38,13 +41,10 @@ REM popd GOTO :End -:GW_DEPS_ROOT_UNDEFINED -ECHO GW_DEPS_ROOT has to be defined, pointing to the root of the dependency tree. +:PM_PACKAGES_ROOT_UNDEFINED +ECHO PM_PACKAGES_ROOT has to be defined, if it's not it means PackMan has not successfully bootstrapped and run as part of this batch file. PAUSE GOTO END -:CUDA_ROOT_UNDEFINED -ECHO CUDA_BIN_PATH has to be defined, pointing to the bin folder of your local CUDA install. -PAUSE :End |