Commit a655740f authored by Filippo Carone's avatar Filippo Carone

libjvlc changes for win32 cross compile

parent 3f0c8f49
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment