diff options
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 6 | ||||
| -rw-r--r-- | build_files/windows/check_libraries.cmd | 6 | ||||
| -rw-r--r-- | build_files/windows/configure_msbuild.cmd | 10 | ||||
| -rw-r--r-- | build_files/windows/detect_architecture.cmd | 10 | ||||
| -rw-r--r-- | build_files/windows/format.cmd | 4 | ||||
| -rw-r--r-- | build_files/windows/parse_arguments.cmd | 11 | ||||
| -rw-r--r-- | build_files/windows/show_help.cmd | 2 | ||||
| -rw-r--r-- | make.bat | 1 |
8 files changed, 17 insertions, 33 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index fa757b2a1c5..8286f5d80a9 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -171,8 +171,7 @@ if(NOT DEFINED LIBDIR) message(STATUS "64 bit compiler detected.") set(LIBDIR_BASE "win64") else() - message(STATUS "32 bit compiler detected.") - set(LIBDIR_BASE "windows") + message(FATAL_ERROR "32 bit compiler detected, blender no longer provides pre-build libraries for 32 bit windows, please set the LIBDIR cmake variable to your own library folder") endif() # Can be 1910..1912 if(MSVC_VERSION GREATER 1919) @@ -386,9 +385,6 @@ if(WITH_BOOST) if(CMAKE_CL_64) set(BOOST_POSTFIX "vc140-mt-s-x64-1_68.lib") set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-x64-1_68.lib") - else() - set(BOOST_POSTFIX "vc140-mt-s-x32-1_68.lib") - set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-x32-1_68.lib") endif() set(BOOST_LIBRARIES optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX} diff --git a/build_files/windows/check_libraries.cmd b/build_files/windows/check_libraries.cmd index 8c5f7ec7e17..fcae2c90657 100644 --- a/build_files/windows/check_libraries.cmd +++ b/build_files/windows/check_libraries.cmd @@ -2,11 +2,7 @@ if "%BUILD_VS_YEAR%"=="2015" set BUILD_VS_LIBDIRPOST=vc14 if "%BUILD_VS_YEAR%"=="2017" set BUILD_VS_LIBDIRPOST=vc14 if "%BUILD_VS_YEAR%"=="2019" set BUILD_VS_LIBDIRPOST=vc14 -if "%BUILD_ARCH%"=="x64" ( - set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST% -) else if "%BUILD_ARCH%"=="x86" ( - set BUILD_VS_SVNDIR=windows_%BUILD_VS_LIBDIRPOST% -) +set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST% set BUILD_VS_LIBDIR="%BLENDER_DIR%..\lib\%BUILD_VS_SVNDIR%" if NOT "%verbose%" == "" ( diff --git a/build_files/windows/configure_msbuild.cmd b/build_files/windows/configure_msbuild.cmd index c316e2286e5..7cb0a4df689 100644 --- a/build_files/windows/configure_msbuild.cmd +++ b/build_files/windows/configure_msbuild.cmd @@ -1,14 +1,6 @@ set BUILD_GENERATOR_POST= set BUILD_PLATFORM_SELECT= -if "%BUILD_ARCH%"=="x64" ( - set MSBUILD_PLATFORM=x64 -) else if "%BUILD_ARCH%"=="x86" ( - set MSBUILD_PLATFORM=win32 - if "%WITH_CLANG%"=="1" ( - echo Clang not supported for X86 - exit /b 1 - ) -) +set MSBUILD_PLATFORM=x64 if "%WITH_CLANG%"=="1" ( set CLANG_CMAKE_ARGS=-T"llvm" diff --git a/build_files/windows/detect_architecture.cmd b/build_files/windows/detect_architecture.cmd index cd211668b7f..42663ef2d29 100644 --- a/build_files/windows/detect_architecture.cmd +++ b/build_files/windows/detect_architecture.cmd @@ -6,11 +6,13 @@ if "%BUILD_ARCH%"=="" ( set WINDOWS_ARCH= Win64 set BUILD_ARCH=x64 ) else ( - set WINDOWS_ARCH= - set BUILD_ARCH=x86 + echo Error: 32 bit builds of blender are no longer supported. + goto ERR ) ) else if "%BUILD_ARCH%"=="x64" ( set WINDOWS_ARCH= Win64 -) else if "%BUILD_ARCH%"=="x86" ( - set WINDOWS_ARCH= ) +:EOF +exit /b 0 +:ERR +exit /b 1
\ No newline at end of file diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd index 9dd6f1fc83b..c291dc581ae 100644 --- a/build_files/windows/format.cmd +++ b/build_files/windows/format.cmd @@ -2,10 +2,6 @@ if EXIST %BLENDER_DIR%\..\lib\win64_vc14\llvm\bin\clang-format.exe ( set CF_PATH=..\lib\win64_vc14\llvm\bin goto detect_done ) -if EXIST %BLENDER_DIR%\..\lib\windows_vc14\llvm\bin\clang-format.exe ( - set CF_PATH=..\lib\windows_vc14\llvm\bin - goto detect_done -) echo clang-format not found exit /b 1 diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index c43107163b8..3f40ef1f5ef 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -45,8 +45,9 @@ if NOT "%1" == "" ( set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -C"%BLENDER_DIR%\build_files\cmake\config\blender_developer.cmake" ) else if "%1" == "asan" ( set WITH_ASAN=1 - ) else if "%1" == "x86" ( - set BUILD_ARCH=x86 + ) else if "%1" == "x86" ( + echo Error: 32 bit builds of blender are no longer supported. + goto ERR ) else if "%1" == "x64" ( set BUILD_ARCH=x64 ) else if "%1" == "2017" ( @@ -99,10 +100,12 @@ if NOT "%1" == "" ( goto EOF ) else ( echo Command "%1" unknown, aborting! - exit /b 1 + goto ERR ) shift /1 goto argv_loop ) :EOF -exit /b 0
\ No newline at end of file +exit /b 0 +:ERR +exit /b 1
\ No newline at end of file diff --git a/build_files/windows/show_help.cmd b/build_files/windows/show_help.cmd index 7c0d33e1e1f..d0469688b5a 100644 --- a/build_files/windows/show_help.cmd +++ b/build_files/windows/show_help.cmd @@ -23,8 +23,6 @@ echo - nobuildinfo ^(disable buildinfo^) echo - debug ^(Build an unoptimized debuggable build^) echo - packagename [newname] ^(override default cpack package name^) echo - buildir [newdir] ^(override default build folder^) -echo - x86 ^(override host auto-detect and build 32 bit code^) -echo - x64 ^(override host auto-detect and build 64 bit code^) echo - 2017 ^(build with visual studio 2017^) echo - 2017pre ^(build with visual studio 2017 pre-release^) echo - 2017b ^(build with visual studio 2017 Build Tools^) @@ -38,6 +38,7 @@ if "%FORMAT%" == "1" ( ) call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd" +if errorlevel 1 goto EOF if "%BUILD_VS_YEAR%" == "" ( call "%BLENDER_DIR%\build_files\windows\autodetect_msvc.cmd" |