Commit: cd320dbfba4a17ce1c1a084fbda417ed58c90391
Author: lazydodo
Date: Tue Oct 4 11:51:04 2016 -0600
Branches: master
https://developer.blender.org/rBcd320dbfba4a17ce1c1a084fbda417ed58c90391
[msvc] make.bat remove mixed cuda 7.5/8.0 build for release since all kernels
can now be properly build with 8.0
===================================================================
M make.bat
===================================================================
diff --git a/make.bat b/make.bat
index 0220758..ad04687 100644
--- a/make.bat
+++ b/make.bat
@@ -126,24 +126,12 @@ set
BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
if "%target%"=="Release" (
rem for vc12 check for both cuda 7.5 and 8
- if "%BUILD_VS_VER%"=="12" (
- if "%CUDA_PATH_V7_5%"=="" (
- echo Cuda 7.5 Not found, aborting!
- goto EOF
- )
- )
- if "%CUDA_PATH_V8_0%"=="" (
- echo Cuda 8.0 Not found, aborting!
+ if "%CUDA_PATH%"=="" (
+ echo Cuda Not found, aborting!
goto EOF
)
- if "%BUILD_VS_VER%"=="12" (
- set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS%
^
-
-C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake"
-DCUDA_NVCC_EXECUTABLE:FILEPATH=%CUDA_PATH_V7_5%/bin/nvcc.exe
-DCUDA_NVCC8_EXECUTABLE:FILEPATH=%CUDA_PATH_V8_0%/bin/nvcc.exe
- )
- if "%BUILD_VS_VER%"=="14" (
- set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS%
^
-
-C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake"
-DCUDA_NVCC_EXECUTABLE:FILEPATH=%CUDA_PATH_V8_0%/bin/nvcc.exe
-DCUDA_NVCC8_EXECUTABLE:FILEPATH=%CUDA_PATH_V8_0%/bin/nvcc.exe
- )
+ set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
+
-C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake"
-DCUDA_NVCC_EXECUTABLE:FILEPATH=%CUDA_PATH%/bin/nvcc.exe
)
:DetectMSVC
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
