diff --git a/Makefile b/Makefile index 4320a1561..c62f8b99a 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ else -Wl,--out-implib=libs/libpd.lib CSHARP_LDFLAGS = $(MINGW_LDFLAGS) -Wl,--output-def=libs/libpdcsharp.def \ -Wl,--out-implib=libs/libpdcsharp.lib - JAVA_LDFLAGS = $(MINGW_LDFLAGS) + JAVA_LDFLAGS = $(MINGW_LDFLAGS) -Wl,--kill-at else # Assume Linux SOLIB_EXT = so PDNATIVE_PLATFORM = linux diff --git a/java-build/org/puredata/natives/windows/x86/pdnative.dll b/java-build/org/puredata/natives/windows/x86/pdnative.dll index a0ebb459a..e1e1f4930 100755 Binary files a/java-build/org/puredata/natives/windows/x86/pdnative.dll and b/java-build/org/puredata/natives/windows/x86/pdnative.dll differ diff --git a/java-build/org/puredata/natives/windows/x86/pthreadGC2-w32.dll b/java-build/org/puredata/natives/windows/x86/pthreadGC2-w32.dll deleted file mode 100644 index 8b5fca030..000000000 Binary files a/java-build/org/puredata/natives/windows/x86/pthreadGC2-w32.dll and /dev/null differ diff --git a/java-build/org/puredata/natives/windows/x86/pthreadGC2.dll b/java-build/org/puredata/natives/windows/x86/pthreadGC2.dll new file mode 100644 index 000000000..54c1ba115 Binary files /dev/null and b/java-build/org/puredata/natives/windows/x86/pthreadGC2.dll differ diff --git a/java-build/org/puredata/natives/windows/x86_64/pdnative.dll b/java-build/org/puredata/natives/windows/x86_64/pdnative.dll index 0c43f441c..f30dd98e4 100755 Binary files a/java-build/org/puredata/natives/windows/x86_64/pdnative.dll and b/java-build/org/puredata/natives/windows/x86_64/pdnative.dll differ diff --git a/java-build/org/puredata/natives/windows/x86_64/pthreadGC2-w64.dll b/java-build/org/puredata/natives/windows/x86_64/pthreadGC2-w64.dll deleted file mode 100644 index 59cd89f1e..000000000 Binary files a/java-build/org/puredata/natives/windows/x86_64/pthreadGC2-w64.dll and /dev/null differ diff --git a/java-build/org/puredata/natives/windows/x86_64/pthreadGC2.dll b/java-build/org/puredata/natives/windows/x86_64/pthreadGC2.dll new file mode 100644 index 000000000..40779807e Binary files /dev/null and b/java-build/org/puredata/natives/windows/x86_64/pthreadGC2.dll differ diff --git a/java/org/puredata/core/PdBase.java b/java/org/puredata/core/PdBase.java index 8aa49e6aa..21512ae45 100644 --- a/java/org/puredata/core/PdBase.java +++ b/java/org/puredata/core/PdBase.java @@ -53,8 +53,7 @@ public final class PdBase { private final static Map patches = new HashMap(); static { - NativeLoader.loadLibrary("pthreadGC2-w32", "windows", "x86"); - NativeLoader.loadLibrary("pthreadGC2-w64", "windows", "x86_64"); + NativeLoader.loadLibrary("pthreadGC2", "windows"); NativeLoader.loadLibrary("pdnative"); initialize(); }