kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup/windows: Remove 32 bit support from make.bat helper script

Browse Source 
This change removes 32 bit support from the helper make.bat scripts
as we are dropping official 32 bit support, you can still build for
32 bit by configuring your build yourself using cmake and pointing
the LIBDIR cmake variable to your own 32 bit library folder.
This commit is contained in:
Lazydodo 2019-08-05 10:31:51 -06:00
parent 592759e3d6
commit 64b092974c
8 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/cmake/platform/platform_win32.cmake
View File

@ -171,8 +171,7 @@ if(NOT DEFINED LIBDIR)
message(STATUS "64 bit compiler detected.") message(STATUS "64 bit compiler detected.")
set(LIBDIR_BASE "win64") set(LIBDIR_BASE "win64")
else() else()
message(STATUS "32 bit compiler detected.") 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")
set(LIBDIR_BASE "windows")
endif() endif()
# Can be 1910..1912 # Can be 1910..1912
if(MSVC_VERSION GREATER 1919) if(MSVC_VERSION GREATER 1919)
@ -386,9 +385,6 @@ if(WITH_BOOST)
if(CMAKE_CL_64) if(CMAKE_CL_64)
set(BOOST_POSTFIX "vc140-mt-s-x64-1_68.lib") set(BOOST_POSTFIX "vc140-mt-s-x64-1_68.lib")
set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-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() endif()
set(BOOST_LIBRARIES set(BOOST_LIBRARIES
optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX} optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX}

6
build_files/windows/check_libraries.cmd
View File

@ -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%"=="2017" set BUILD_VS_LIBDIRPOST=vc14
if "%BUILD_VS_YEAR%"=="2019" 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%
set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST%
) else if "%BUILD_ARCH%"=="x86" (
set BUILD_VS_SVNDIR=windows_%BUILD_VS_LIBDIRPOST%
)
set BUILD_VS_LIBDIR="%BLENDER_DIR%..\lib\%BUILD_VS_SVNDIR%" set BUILD_VS_LIBDIR="%BLENDER_DIR%..\lib\%BUILD_VS_SVNDIR%"
if NOT "%verbose%" == "" ( if NOT "%verbose%" == "" (

10
build_files/windows/configure_msbuild.cmd
View File

@ -1,14 +1,6 @@
set BUILD_GENERATOR_POST= set BUILD_GENERATOR_POST=
set BUILD_PLATFORM_SELECT= set BUILD_PLATFORM_SELECT=
if "%BUILD_ARCH%"=="x64" ( set MSBUILD_PLATFORM=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
)
)
if "%WITH_CLANG%"=="1" ( if "%WITH_CLANG%"=="1" (
set CLANG_CMAKE_ARGS=-T"llvm" set CLANG_CMAKE_ARGS=-T"llvm"

10
build_files/windows/detect_architecture.cmd
View File

@ -6,11 +6,13 @@ if "%BUILD_ARCH%"=="" (
set WINDOWS_ARCH= Win64 set WINDOWS_ARCH= Win64
set BUILD_ARCH=x64 set BUILD_ARCH=x64
) else ( ) else (
set WINDOWS_ARCH= echo Error: 32 bit builds of blender are no longer supported.
set BUILD_ARCH=x86 goto ERR
) )
) else if "%BUILD_ARCH%"=="x64" ( ) else if "%BUILD_ARCH%"=="x64" (
set WINDOWS_ARCH= Win64 set WINDOWS_ARCH= Win64
) else if "%BUILD_ARCH%"=="x86" (
set WINDOWS_ARCH=
) )
:EOF
exit /b 0
:ERR
exit /b 1

4
build_files/windows/format.cmd
View File

@ -2,10 +2,6 @@ if EXIST %BLENDER_DIR%\..\lib\win64_vc14\llvm\bin\clang-format.exe (
set CF_PATH=..\lib\win64_vc14\llvm\bin set CF_PATH=..\lib\win64_vc14\llvm\bin
goto detect_done 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 echo clang-format not found
exit /b 1 exit /b 1

7
build_files/windows/parse_arguments.cmd
View File

@ -46,7 +46,8 @@ if NOT "%1" == "" (
) else if "%1" == "asan" ( ) else if "%1" == "asan" (
set WITH_ASAN=1 set WITH_ASAN=1
) else if "%1" == "x86" ( ) else if "%1" == "x86" (
set BUILD_ARCH=x86 echo Error: 32 bit builds of blender are no longer supported.
goto ERR
) else if "%1" == "x64" ( ) else if "%1" == "x64" (
set BUILD_ARCH=x64 set BUILD_ARCH=x64
) else if "%1" == "2017" ( ) else if "%1" == "2017" (
@ -99,10 +100,12 @@ if NOT "%1" == "" (
goto EOF goto EOF
) else ( ) else (
echo Command "%1" unknown, aborting! echo Command "%1" unknown, aborting!
exit /b 1 goto ERR
) )
shift /1 shift /1
goto argv_loop goto argv_loop
) )
:EOF :EOF
exit /b 0 exit /b 0
:ERR
exit /b 1

2
build_files/windows/show_help.cmd
View File

@ -23,8 +23,6 @@ echo - nobuildinfo ^(disable buildinfo^)
echo - debug ^(Build an unoptimized debuggable build^) echo - debug ^(Build an unoptimized debuggable build^)
echo - packagename [newname] ^(override default cpack package name^) echo - packagename [newname] ^(override default cpack package name^)
echo - buildir [newdir] ^(override default build folder^) 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 - 2017 ^(build with visual studio 2017^)
echo - 2017pre ^(build with visual studio 2017 pre-release^) echo - 2017pre ^(build with visual studio 2017 pre-release^)
echo - 2017b ^(build with visual studio 2017 Build Tools^) echo - 2017b ^(build with visual studio 2017 Build Tools^)

1
make.bat
View File

@ -38,6 +38,7 @@ if "%FORMAT%" == "1" (
) )
call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd" call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd"
if errorlevel 1 goto EOF
if "%BUILD_VS_YEAR%" == "" ( if "%BUILD_VS_YEAR%" == "" (
call "%BLENDER_DIR%\build_files\windows\autodetect_msvc.cmd" call "%BLENDER_DIR%\build_files\windows\autodetect_msvc.cmd"