Fix builds for CPython on Windows

bytedeco · Oct 17, 2024 · 347a8f8 · 347a8f8
1 parent 59c6d01
commit 347a8f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cpython/cppbuild.sh b/cpython/cppbuild.sh
@@ -179,7 +179,7 @@ case $PLATFORM in
         cp win32/*.dll win32/*.pyd ../../lib/
         cd ..
         cp -r Lib/* ../lib/
-        cp -r Include/* PC/pyconfig.h ../include/
+        cp -r Include/* PCbuild/win32/pyconfig.h ../include/
         unzip -o ../lib/ensurepip/_bundled/pip* -d ../lib/
         # unzip -o ../lib/ensurepip/_bundled/setuptools* -d ../lib/
         ;;
@@ -192,7 +192,7 @@ case $PLATFORM in
         cp amd64/*.dll amd64/*.pyd ../../lib/
         cd ..
         cp -r Lib/* ../lib/
-        cp -r Include/* PC/pyconfig.h ../include/
+        cp -r Include/* PCbuild/amd64/pyconfig.h ../include/
         unzip -o ../lib/ensurepip/_bundled/pip* -d ../lib/
         # unzip -o ../lib/ensurepip/_bundled/setuptools* -d ../lib/
         ;;

diff --git a/cpython/src/main/java/org/bytedeco/cpython/presets/python.java b/cpython/src/main/java/org/bytedeco/cpython/presets/python.java
@@ -372,7 +372,7 @@ public void map(InfoMap infoMap) {
                .put(new Info("PyThreadFrameGetter", "jmp_buf", "_PyInterpreterFrame", "_stack_chunk", "_PyExecutorObject").cast().pointerTypes("Pointer"))
 
                .put(new Info("_Py_memory_order", "PyThreadState::_preserve_36_ABI_1", "PyThreadState::_preserve_36_ABI_2",
-                             "_PyGC_generation0", "_PyBytes_InsertThousandsGroupingLocale",
+                             "_PyGC_generation0", "_PyBytes_InsertThousandsGroupingLocale","_PyTrash_begin", "_PyTrash_end",
                              "_PyBytes_InsertThousandsGrouping", "_PyUnicode_DecodeUnicodeInternal",
                              "_PyFloat_Repr", "_PyFloat_Digits", "_PyFloat_DigitsInit", "_PyErr_SetImportErrorWithNameFrom",
                              "PySortWrapper_Type", "PyCmpWrapper_Type", "_PyGen_yf", "_PyAIterWrapper_New",