Fixed pthread linkage and --kill-at again for windows.

Apolotary · May 9, 2012 · e08b683 · e08b683
1 parent ced203f
commit e08b683
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 3 deletions.
diff --git 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
diff --git a/java-build/org/puredata/natives/windows/x86/pthreadGC2-w32.dll b/java-build/org/puredata/natives/windows/x86/pthreadGC2-w32.dll
diff --git a/java-build/org/puredata/natives/windows/x86/pthreadGC2.dll b/java-build/org/puredata/natives/windows/x86/pthreadGC2.dll
diff --git a/java-build/org/puredata/natives/windows/x86_64/pdnative.dll b/java-build/org/puredata/natives/windows/x86_64/pdnative.dll
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
diff --git a/java-build/org/puredata/natives/windows/x86_64/pthreadGC2.dll b/java-build/org/puredata/natives/windows/x86_64/pthreadGC2.dll
diff --git 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<Integer, Long> patches = new HashMap<Integer, Long>();
 
 	static {
-		NativeLoader.loadLibrary("pthreadGC2-w32", "windows", "x86");
-		NativeLoader.loadLibrary("pthreadGC2-w64", "windows", "x86_64");
+		NativeLoader.loadLibrary("pthreadGC2", "windows");
 		NativeLoader.loadLibrary("pdnative");
 		initialize();
 	}