another attempt to make java bindings win32 friendly.

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index a54dfee12d49b662b512bdfc73e69951cd2340ea..5749ad032cde9e9e1244a3a979f70df201949a55 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -13,8 +13,10 @@ JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
 LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
 JCC = javac
 JCH = javah
+JAVA_CC_FLAGS =
 #CXX = g++ -Wall -mno-cygwin -g
 #LDFLAGS = -mno-cygwin `vlc-config --libs external pic` -Wl,--kill-at
+JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
 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
@@ -23,6 +25,7 @@ JCC = gcj -g
 JCH = gcjh -jni
 SWT_PATH = /usr/share/java
 # Compile flags
+JAVA_CC_FLAGS = -C
 JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
 JAVALDFLAGS = -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic`
 endif
@@ -32,7 +35,7 @@ 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
+       $(CXX) -shared vlc-libvlc-jni.o vlc-graphics-jni.o $(LIBJINCLUDES) $(LDFLAGS) $(JAVALDFLAGS) -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
@@ -45,13 +48,18 @@ vlc-libvlc-jni.o: VlcClient
        $(CXX) -c vlc-libvlc-jni.cc $(CXXFLAGS) $(JAVACXXFLAGS)
 
 VlcClient: $(OBJECTS)
-       $(JCC) -C VlcClient.java
+       $(JCC) $(JAVA_CC_FLAGS) VlcClient.java
 
 VLCExample: $(OBJECTS)
-       $(JCC) -C VLCExample.java
+       $(JCC) $(JAVA_CC_FLAGS) VLCExample.java
 
+if HAVE_WIN32
+%.class: %.java
+       $(JCC) $(JAVA_CC_FLAGS) $?
+       $(JCH) org.videolan.jvlc.$(*F)
+else
 %.class: %.java
-       $(JCC) -C $?
+       $(JCC) $(JAVA_CC_FLAGS) $?
        $(JCH) org/videolan/jvlc/$(*F)
 
 clean:

diff --git a/bindings/java/vlc-graphics-jni.cc b/bindings/java/vlc-graphics-jni.cc
index 0e843f7f9c69001b6245da0f99498767e8ca27c0..badcc76da2fb6a373b6611df9d6e55e715db7620 100644 (file)
--- a/bindings/java/vlc-graphics-jni.cc
+++ b/bindings/java/vlc-graphics-jni.cc
@@ -26,7 +26,10 @@
 #include <jawt.h>
 #include <jawt_md.h>
 
+#ifndef WIN32
 #include <X11/Xlib.h> // for Xlibs graphics functions
+#endif
+
 #include <stdio.h>    // for printf
 
 /* JVLC internal imports, generated by gcjh */
@@ -41,10 +44,16 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLCCanvas_paint (JNIEnv *env, job
   JAWT awt;
   JAWT_DrawingSurface* ds;
   JAWT_DrawingSurfaceInfo* dsi;
+
+#ifdef WIN32
+  JAWT_Win32DrawingSurfaceInfo* dsi_win;
+#else
   JAWT_X11DrawingSurfaceInfo* dsi_x11;
+  GC gc;
+#endif
 
   jint lock;
-  GC gc;
+
     
   vlc_value_t value;