802ac5ba5a
Update libraries to match VFX platform 2024, and a few other upgrades to latest versions. boost 1.82.0 deflate 1.18 (new) ffi 3.4.4 freeglut (deleted) ispc 1.12.1 llvm 17.0.6 materialx 1.38.8 mesa 23.3.0 numpy 1.24.3 opencolorio 2.3.0 openexr 3.2.1 openimageio 2.5.6.0 opensubdiv 3.6.0 openvdb 11.0.0 osl 1.13.5.0 (now dynamic) python 3.11.6 sqlite 3.42.0 sse2neon 0d6e9b3dd4 usd 23.11 vulkan 1.3.270 xm2 2.12.3 This only updates the build scripts, the precompiled libraries for each platform will land over the coming weeks. Ref #113157 Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Campbell Barton <campbell@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/116420
35 lines
1.8 KiB
Diff
35 lines
1.8 KiB
Diff
--- a/PCbuild/prepare_ssl.bat 2022-10-30 11:48:14 -0600
|
|
+++ b/PCbuild/prepare_ssl.bat 2022-10-30 11:53:16 -0600
|
|
@@ -47,12 +47,13 @@
|
|
if "%PERL%" == "" where perl > "%TEMP%\perl.loc" 2> nul && set /P PERL= <"%TEMP%\perl.loc" & del "%TEMP%\perl.loc"
|
|
if "%PERL%" == "" (echo Cannot locate perl.exe on PATH or as PERL variable & exit /b 4)
|
|
|
|
-%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
|
|
-if errorlevel 1 exit /b
|
|
+REM Blender: we only need x64, ssl is kind of a long build, so just build what we need
|
|
+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
|
|
+REM if errorlevel 1 exit /b
|
|
%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=x64
|
|
if errorlevel 1 exit /b
|
|
-%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM
|
|
-if errorlevel 1 exit /b
|
|
-%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
|
|
-if errorlevel 1 exit /b
|
|
+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM
|
|
+REM if errorlevel 1 exit /b
|
|
+REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
|
|
+REM if errorlevel 1 exit /b
|
|
|
|
diff -aurw Python-3.10.12/PCbuild/openssl.vcxproj external_python/PCbuild/openssl.vcxproj
|
|
--- Python-3.10.12/PCbuild/openssl.vcxproj 2023-06-06 16:30:33 -0600
|
|
+++ external_python/PCbuild/openssl.vcxproj 2023-06-20 08:50:43 -0600
|
|
@@ -98,7 +98,7 @@
|
|
|
|
<Target Name="_CopyToOutput" AfterTargets="Build">
|
|
<ItemGroup>
|
|
- <_Built Include="$(opensslDir)\LICENSE" />
|
|
+ <_Built Include="$(opensslDir)\LICENSE.txt" />
|
|
<_Built Include="$(IntDir)\libcrypto.lib;$(IntDir)\libcrypto-*.dll;$(IntDir)\libcrypto-*.pdb" />
|
|
<_Built Include="$(IntDir)\libssl.lib;$(IntDir)\libssl-*.dll;$(IntDir)\libssl-*.pdb" />
|
|
<_AppLink Include="$(opensslDir)\ms\applink.c" />
|