A first try in making the Makefile crossplatform (gnu/win32)

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index bb89f683518a97316c301304467f989fe4497c57..2973d1133d186518cde2b032783d1951d8e0d793 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -6,28 +6,37 @@ if BUILD_JAVA
 
 OBJECTS = org/videolan/jvlc/AudioIntf.class org/videolan/jvlc/InputIntf.class org/videolan/jvlc/PlaylistIntf.class org/videolan/jvlc/VideoIntf.class org/videolan/jvlc/JLibVLC.class org/videolan/jvlc/JVLC.class org/videolan/jvlc/JVLCCanvas.class org/videolan/jvlc/JVLCPanel.class org/videolan/jvlc/VLMIntf.class org/videolan/jvlc/Playlist.class org/videolan/jvlc/GenericVideoWidget.class
 
-JNIHEADERS = org_videolan_jvlc_JVLC.h org_videolan_jvlc_JVLCCanvas.h org_videolan_jvlc_JVLCPanel.h
-
 # Include some JAVA stuff
 PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/'`
+if HAVE_WIN32
+JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
+LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
+JCC = javac
+JCH = javah
+CXX = g++ -Wall -mno-cygwin  -
+LDFLAGS = -mno-cygwin `vlc-config --libs external pic` -Wl,--kill-at
+JAVALDFLAGS = -mno-cygwin -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic` -Wl,--kill-at
+else
 JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt
-SWT_PATH = /usr/share/java
-
-
-# Binaries
 JCC = gcj -g
 JCH = gcjh -jni
-
+SWT_PATH = /usr/share/java
 # Compile flags
 JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
 JAVALDFLAGS = -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic`
+endif
 
 # Build targets
 all: libjvlc.so VlcClient VLCExample
 
+if HAVE_WIN32
+libjvlc.so: vlc-libvlc-jni.o vlc-graphics-jni.o
+       $(CXX) -shared vlc-libvlc-jni.o vlc-graphics-jni.o $(LIBJINCLUDES) $(LDFLAGS) -o jvlc.dll
+else
 libjvlc.so: vlc-libvlc-jni.o vlc-graphics-jni.o
        $(CXX) -shared vlc-libvlc-jni.o vlc-graphics-jni.o $(LIBJINCLUDES) $(LDFLAGS) $(JAVALDFLAGS) -o libjvlc.so
+endif
 
 vlc-graphics-jni.o: VlcClient
        $(CXX) -c vlc-graphics-jni.cc $(CXXFLAGS) $(JAVACXXFLAGS)