|
| 1 | +diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake |
| 2 | +index ae75fcd2..96600f7f 100644 |
| 3 | +--- a/build_files/cmake/platform/platform_win32.cmake |
| 4 | ++++ b/build_files/cmake/platform/platform_win32.cmake |
| 5 | +@@ -349,12 +349,14 @@ else() |
| 6 | + message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") |
| 7 | + endif() |
| 8 | + endif() |
| 9 | ++if(0) |
| 10 | + if(NOT EXISTS "${LIBDIR}/.git") |
| 11 | + message(FATAL_ERROR |
| 12 | + "\n\nWindows requires pre-compiled libs at: '${LIBDIR}'. " |
| 13 | + "Please run `make update` in the blender source folder to obtain them." |
| 14 | + ) |
| 15 | + endif() |
| 16 | ++endif() |
| 17 | + |
| 18 | + include(platform_old_libs_update) |
| 19 | + |
| 20 | +@@ -397,11 +399,13 @@ if(WITH_PUGIXML) |
| 21 | + set(PUGIXML_INCLUDE_DIR ${LIBDIR}/pugixml/include) |
| 22 | + endif() |
| 23 | + |
| 24 | ++if(0) |
| 25 | + set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include) |
| 26 | + set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib) |
| 27 | + set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include) |
| 28 | + set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib) |
| 29 | + set(ZLIB_DIR ${LIBDIR}/zlib) |
| 30 | ++endif() |
| 31 | + |
| 32 | + windows_find_package(ZLIB) # We want to find before finding things that depend on it like PNG. |
| 33 | + windows_find_package(PNG) |
| 34 | +@@ -422,13 +426,19 @@ if(NOT JPEG_FOUND) |
| 35 | + set(JPEG_LIBRARIES ${LIBDIR}/jpeg/lib/libjpeg.lib) |
| 36 | + endif() |
| 37 | + |
| 38 | +-set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy) |
| 39 | ++# set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy) |
| 40 | + windows_find_package(Epoxy REQUIRED) |
| 41 | ++if(0) |
| 42 | + if(NOT EPOXY_FOUND) |
| 43 | + set(Epoxy_INCLUDE_DIRS ${LIBDIR}/epoxy/include) |
| 44 | + set(Epoxy_LIBRARIES ${LIBDIR}/epoxy/lib/epoxy.lib) |
| 45 | + endif() |
| 46 | ++endif() |
| 47 | + |
| 48 | ++find_package(PThreads4W REQUIRED) |
| 49 | ++set(PTHREADS_INCLUDE_DIRS ${PThreads4W_INCLUDE_DIR}) |
| 50 | ++set(PTHREADS_LIBRARIES PThreads4W::PThreads4W) |
| 51 | ++if(0) |
| 52 | + set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include) |
| 53 | + set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC3.lib) |
| 54 | + |
| 55 | +@@ -444,6 +454,7 @@ set(BROTLI_LIBRARIES |
| 56 | + ${LIBDIR}/brotli/lib/brotlidec-static.lib |
| 57 | + ${LIBDIR}/brotli/lib/brotlicommon-static.lib |
| 58 | + ) |
| 59 | ++endif() |
| 60 | + |
| 61 | + windows_find_package(Freetype REQUIRED) |
| 62 | + |
| 63 | +@@ -1337,8 +1348,11 @@ if(WITH_CYCLES AND WITH_CYCLES_PATH_GUIDING) |
| 64 | + endif() |
| 65 | + endif() |
| 66 | + |
| 67 | ++find_package(Zstd REQUIRED) |
| 68 | ++if(0) |
| 69 | + set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include) |
| 70 | + set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib) |
| 71 | ++endif() |
| 72 | + |
| 73 | + if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_SYCL_SUPPORT))) |
| 74 | + set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero) |
| 75 | +@@ -1380,10 +1394,15 @@ endif() |
| 76 | + get_filename_component(_msvc_path ${CMAKE_C_COMPILER} DIRECTORY) |
| 77 | + # Environment variables to run precompiled executables that needed libraries. |
| 78 | + list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ";" _library_paths) |
| 79 | +-set(PLATFORM_ENV_BUILD_DIRS "${_msvc_path}\;${LIBDIR}/epoxy/bin\;${LIBDIR}/tbb/bin\;${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${LIBDIR}/shaderc/bin\;${LIBDIR}/opencolorio/bin\;${PATH}") |
| 80 | ++set(_vcpkg_runtime_path "") |
| 81 | ++if(DEFINED VCPKG_BLENDER_RUNTIME_DIR) |
| 82 | ++ set(_vcpkg_runtime_path "${VCPKG_BLENDER_RUNTIME_DIR}\;") |
| 83 | ++endif() |
| 84 | ++set(PLATFORM_ENV_BUILD_DIRS "${_msvc_path}\;${LIBDIR}/epoxy/bin\;${LIBDIR}/tbb/bin\;${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${LIBDIR}/shaderc/bin\;${LIBDIR}/opencolorio/bin\;${_vcpkg_runtime_path}${PATH}") |
| 85 | + set(PLATFORM_ENV_BUILD "PATH=${PLATFORM_ENV_BUILD_DIRS}") |
| 86 | + # Install needs the additional folders from PLATFORM_ENV_BUILD_DIRS as well, as tools like: |
| 87 | + # `idiff` and `abcls` use the release mode dlls. |
| 88 | + set(PLATFORM_ENV_INSTALL "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/\;${PLATFORM_ENV_BUILD_DIRS}\;$ENV{PATH}") |
| 89 | ++unset(_vcpkg_runtime_path) |
| 90 | + unset(_library_paths) |
| 91 | + unset(_msvc_path) |
0 commit comments