From 29f948c574b94b822cd1f1b703072a5644331373 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Fri, 16 Feb 2024 17:53:52 +0100
Subject: [PATCH] Python: fix build

---
 MagPython/MagPython.vcxproj | 43 +++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/MagPython/MagPython.vcxproj b/MagPython/MagPython.vcxproj
index ee68c0a1..49d61bcf 100644
--- a/MagPython/MagPython.vcxproj
+++ b/MagPython/MagPython.vcxproj
@@ -64,7 +64,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;MAG_PY_EMBED;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;FFI_STATIC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(OutDir)\include</AdditionalIncludeDirectories>
       <!-- from python.props -->
       <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -85,7 +85,8 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>version.lib;ws2_32.lib;Crypt32.lib;winmm.lib;pathcch.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>version.lib;Crypt32.lib;winmm.lib;pathcch.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>LIBC;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
     </Link>
     <Lib>
@@ -499,7 +500,6 @@
     <ClCompile Include="$(PythonSourceDir)\Python\compile.c" />
     <ClCompile Include="$(PythonSourceDir)\Python\context.c" />
     <ClCompile Include="$(PythonSourceDir)\Python\dynamic_annotations.c" />
-    <ClCompile Include="$(PythonSourceDir)\Python\dynload_win.c" />
     <ClCompile Include="$(PythonSourceDir)\Python\errors.c" />
     <ClCompile Include="$(PythonSourceDir)\Python\fileutils.c" />
     <ClCompile Include="$(PythonSourceDir)\Python\flowgraph.c" />
@@ -560,7 +560,20 @@
     <!-- END deepfreeze -->
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(PythonSourceDir)\Modules\getbuildinfo.c" />
+    <ClCompile Include="$(PythonSourceDir)\Modules\zlibmodule.c" />
+    <ClCompile Include="$(zlibDir)\adler32.c" />
+    <ClCompile Include="$(zlibDir)\compress.c" />
+    <ClCompile Include="$(zlibDir)\crc32.c" />
+    <ClCompile Include="$(zlibDir)\deflate.c">
+      <DisableSpecificWarnings>4244</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="$(zlibDir)\infback.c" />
+    <ClCompile Include="$(zlibDir)\inffast.c" />
+    <ClCompile Include="$(zlibDir)\inflate.c" />
+    <ClCompile Include="$(zlibDir)\inftrees.c" />
+    <ClCompile Include="$(zlibDir)\trees.c" />
+    <ClCompile Include="$(zlibDir)\uncompr.c" />
+    <ClCompile Include="$(zlibDir)\zutil.c" />
   </ItemGroup>
   <ItemGroup>
     <!-- _hashlib -->
@@ -592,7 +605,9 @@
     <!-- ctypes -->
     <ClInclude Include="$(PythonSourceDir)\Modules\_ctypes\ctypes.h" />
     <ClCompile Include="$(PythonSourceDir)\Modules\_ctypes\_ctypes.c" />
-    <ClCompile Include="$(PythonSourceDir)\Modules\_ctypes\callbacks.c" />
+    <ClCompile Include="$(PythonSourceDir)\Modules\_ctypes\callbacks.c">
+      <PreprocessorDefinitions>Py_NO_ENABLE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="$(PythonSourceDir)\Modules\_ctypes\callproc.c" />
     <ClCompile Include="$(PythonSourceDir)\Modules\_ctypes\cfield.c" />
     <ClCompile Include="$(PythonSourceDir)\Modules\_ctypes\malloc_closure.c" />
@@ -602,18 +617,10 @@
     <ClCompile Include="$(PythonSourceDir)\PC\dl_nt.c" />
   </ItemGroup>
 
-  <!--
-  <ItemGroup>
-    <CustomBuild Include="$(PythonSourceDir)\Modules\_ctypes\libffi_msvc\win64.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
-      <Command>ml64 /nologo /c /Zi /Fo "$(IntDir)win64.obj" "%(FullPath)"</Command>
-      <Outputs>$(IntDir)win64.obj;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  -->
   <ItemGroup>
     <Library Include="$(OutDir)\libcrypto.lib" />
     <Library Include="$(OutDir)\libssl.lib" />
+    <Library Include="$(OutDir)\libffi.lib" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
@@ -621,13 +628,13 @@
 
   <Target Name="CopyArtifacts" AfterTargets="Build">
     <ItemGroup>
-      <IncludeFile Include="$(PythonSourceDir)\PC\pyconfig.h" />
-      <IncludeFile Include="$(PythonSourceDir)\include\*" />
+      <ExtraIncludeFile Include="$(PythonSourceDir)\PC\pyconfig.h" />
+      <IncludeFile Include="$(PythonSourceDir)\include\**\*" />
       <PythonFiles Include="$(PythonSourceDir)\lib\**\*.py" />
     </ItemGroup>
     <MakeDir Directories="$(OutDir)\include\Python" />
-    <Copy SourceFiles="@(IncludeFile)" DestinationFolder="$(OutDir)\include\Python\" />
-    <Copy SourceFiles="@(IncludeFile)" DestinationFolder="$(OutDir)\include\Python\" />
+    <Copy SourceFiles="@(ExtraIncludeFile)" DestinationFolder="$(OutDir)\include\Python\" />
+    <Copy SourceFiles="@(IncludeFile)" DestinationFolder="$(OutDir)\include\Python\%(RecursiveDir)" />
     <Copy SourceFiles="@(PythonFiles)" DestinationFolder="$(OutDir)\lib\%(RecursiveDir)" />
   </Target>
 </Project>