aboutsummaryrefslogtreecommitdiff
path: root/NvCloth/CmakeGenerateProjects.bat
diff options
context:
space:
mode:
authorMarijn Tamis <[email protected]>2019-04-01 14:21:09 +0200
committerMarijn Tamis <[email protected]>2019-04-01 14:21:09 +0200
commitd243404d4ba88bcf53f7310cc8980b4efe38c19f (patch)
treedcc8ce2904e9f813e03f71f825c4d3c9ec565d91 /NvCloth/CmakeGenerateProjects.bat
parentAdd new SetSpheres and SetPlanes api's to bring them in line with setTriangles. (diff)
downloadnvcloth-1.1.6.tar.xz
nvcloth-1.1.6.zip
1.1.6 Release.1.1.6
Diffstat (limited to 'NvCloth/CmakeGenerateProjects.bat')
-rw-r--r--NvCloth/CmakeGenerateProjects.bat23
1 files changed, 7 insertions, 16 deletions
diff --git a/NvCloth/CmakeGenerateProjects.bat b/NvCloth/CmakeGenerateProjects.bat
index 6e0f7dc..5896f9a 100644
--- a/NvCloth/CmakeGenerateProjects.bat
+++ b/NvCloth/CmakeGenerateProjects.bat
@@ -4,22 +4,19 @@ set EXIT_CODE=0
REM Make sure the various variables that we need are set
CD /D %~dp0
-echo "Note: You need to run this with admin rights for the first time to set GW_DEPS_ROOT globally."
-call "./scripts/locate_gw_root.bat" GW_DEPS_ROOT_F
-REM single " is not a mistake
-setx GW_DEPS_ROOT "%GW_DEPS_ROOT_F%
-REM this one is for local use
-set GW_DEPS_ROOT=%GW_DEPS_ROOT_F%
-echo GW_DEPS_ROOT = %GW_DEPS_ROOT%
REM Make sure the various variables that we need are set
call "./scripts/locate_cuda.bat" CUDA_PATH_
echo CUDA_PATH_ = %CUDA_PATH_%
-IF EXIST %~dp0..\Externals\CMakeModules (
- set GW_DEPS_ROOT=%~dp0..\
-)
+set GW_DEPS_ROOT=%~dp0..\
+echo "Note: You need to run this with admin rights for the first time to set GW_DEPS_ROOT globally."
+REM single " is not a mistake
+setx GW_DEPS_ROOT "%GW_DEPS_ROOT%
+REM this one is for local use
+set GW_DEPS_ROOT=%GW_DEPS_ROOT%
+echo GW_DEPS_ROOT = %GW_DEPS_ROOT%
IF NOT DEFINED GW_DEPS_ROOT goto GW_DEPS_ROOT_UNDEFINED
@@ -70,12 +67,6 @@ pushd compiler\vc12win64-cmake\
%CMAKE% ..\cmake\windows -G "Visual Studio 12 2013" -Ax64 %CMAKE_COMMON_PARAMS% -DPX_OUTPUT_DLL_DIR=%PX_OUTPUT_ROOT%\bin\vc12win64-cmake -DPX_OUTPUT_LIB_DIR=%PX_OUTPUT_ROOT%\lib\vc12win64-cmake -DPX_OUTPUT_EXE_DIR=%PX_OUTPUT_ROOT%\bin\vc12win64-cmake
popd
-rmdir /s /q compiler\vc14win32-cmake\
-mkdir compiler\vc14win32-cmake\
-pushd compiler\vc14win32-cmake\
-%CMAKE% ..\cmake\windows -G "Visual Studio 14 2015" -AWin32 %CMAKE_COMMON_PARAMS% -DPX_OUTPUT_DLL_DIR=%PX_OUTPUT_ROOT%\bin\vc14win32-cmake -DPX_OUTPUT_LIB_DIR=%PX_OUTPUT_ROOT%\lib\vc14win32-cmake -DPX_OUTPUT_EXE_DIR=%PX_OUTPUT_ROOT%\bin\vc14win32-cmake
-popd
-
rmdir /s /q compiler\vc14win64-cmake\
mkdir compiler\vc14win64-cmake\
pushd compiler\vc14win64-cmake\