7e3b83b146
* VS2022 is required. * Only OpenPGL and DPCPP are disabled, other libraries are supported. * Embree is built with LLVM and VS2019 tools, and for that reason has its own cmake file as it is quite different. * TBB and USD patches should become obsolete once these are upstreamed and Blender upgrades to the latest versions. Ref #119126 Pull Request: https://projects.blender.org/blender/blender/pulls/117036
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" />
|