Fix builds for CPython and LLVM on Windows

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

Hide file tree

Showing 4 changed files with 6 additions and 6 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/gen/java/org/bytedeco/cpython/global/python.java b/cpython/src/gen/java/org/bytedeco/cpython/global/python.java
@@ -4692,8 +4692,8 @@ passed as second argument to Py_TRASHCAN_BEGIN().
 */
 
 /* Python 3.9 private API, invoked by the macros below. */
-@NoException public static native int _PyTrash_begin(PyThreadState tstate, PyObject op);
-@NoException public static native void _PyTrash_end(PyThreadState tstate);
+
+
 
 @NoException public static native void _PyTrash_thread_deposit_object(PyThreadState tstate, PyObject op);
 @NoException public static native void _PyTrash_thread_destroy_chain(PyThreadState tstate);

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",

diff --git a/llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java b/llvm/src/main/java/org/bytedeco/llvm/presets/LLVM.java
@@ -40,7 +40,7 @@
                "<llvm-c/Transforms/PassBuilder.h>", "<polly/LinkAllPasses.h>", "<FullOptimization.h>", "<NamedMetadataOperations.h>", "<TargetStubs.h>"},
     compiler = "cpp17", link = {"[email protected]", "[email protected]", "[email protected]"}, resource = {"include", "lib", "libexec", "share"}),
         @Platform(value = "macosx", link = {"LLVM", "LTO", "Remarks"}),
-        @Platform(value = "windows", link = {"Ws2_32", "LLVM", "LTO", "Remarks"})})
+        @Platform(value = "windows", link = {"ntdll", "Ws2_32", "LLVM", "LTO", "Remarks"})})
 @NoException
 public class LLVM implements InfoMapper {
     static { Loader.checkVersion("org.bytedeco", "llvm"); }