Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLazydodo <github@lazydodo.com>2019-08-05 19:31:51 +0300
committerLazydodo <github@lazydodo.com>2019-08-05 19:31:51 +0300
commit64b092974c712fd0297e6801c1b7a88737185a95 (patch)
treee1efb9128e82d5c67c5da9e001f7a7c6d1b79698 /build_files/cmake
parent592759e3d62a59e05ac1603a0ed9b22f1d4b9ff5 (diff)
Cleanup/windows: Remove 32 bit support from make.bat helper script
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.
Diffstat (limited to 'build_files/cmake')
-rw-r--r--build_files/cmake/platform/platform_win32.cmake6
1 files changed, 1 insertions, 5 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}