libjvlc changes for win32 cross compile

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index d9afa2f1ff782ca5812f4777acde6c19dc18dd62..ce6bf54df260a24b9db78436aa1c9bd35cc804cc 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -39,7 +39,7 @@ 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
+LIBJINCLUDES = -L${JAVA_HOME}/jre/bin -lawt
 JCH = javah
 else
 JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux

diff --git a/bindings/java/src/Makefile.am b/bindings/java/src/Makefile.am
index 50c8946888d7dc7b0cefc8da31d6b2bb90239893..2a2d254afca239e83ed2ce0ad9fba6c1d77f4a11 100644 (file)
--- a/bindings/java/src/Makefile.am
+++ b/bindings/java/src/Makefile.am
@@ -11,19 +11,28 @@ libjvlc_la_SOURCES = \
 libjvlc_la_CPPFLAGS = `$(VLC_CONFIG) --cflags pic` $(JINCLUDES)
 libjvlc_la_LIBADD = ../../../src/libvlc-control.la $(LIBJINCLUDES)
 
+libjvlc_a_SOURCES=$(libjvlc_la_SOURCES)
+libjvlc_a_CPPFLAGS = `$(VLC_CONFIG) --cflags pic` $(JINCLUDES)
+libjvlc_a_LIBADD = ../../../src/libvlc.a
+
+
 if BUILD_JAVA
 
 if USE_LIBTOOL
 lib_LTLIBRARIES = libjvlc.la
 else
+lib_LIBRARIES = libjvlc.a
+endif 
 
-COBJECTS = utils.o video-jni.o audio-jni.o input-jni.o playlist-jni.o vlm-jni.o core-jni.o graphics-jni.o
+if HAVE_WIN32
+DATA_noinst_libjvlc = libjvlc$(LIBEXT) libjvlc$(LIBEXT).a
 
-JAVACXXFLAGS = -I. -Isrc -I../../ -I ../../include -I../../../include  $(JINCLUDES) `top_builddir=../../.. ../../../vlc-config --cflags pic` -c
-AM_CXXFLAGS = $(JAVACXXFLAGS)
+libjvlc.dll.a libjvlc.def: libjvlc$(LIBEXT)
+       $(DLLTOOL) -z libjvlc.def -l libjvlc.dll.a -D $< $(libjvlc_a_OBJECTS)
 
-all-am: $(COBJECTS)
+libjvlc$(LIBEXT): $(libjvlc_a_OBJECTS)
 
+all: libjvlc.dll.a
 endif
 
 .PHONY: clean-local