Commit e5db0823 authored by Filippo Carone's avatar Filippo Carone

make the java bindings compile again (use --disable-libtool in configure)

parent 9a78b063
......@@ -2,7 +2,7 @@
# VLC Java Bindings
#######################################################################
SUBDIRS= src
#SUBDIRS= src
DIST_SUBDIRS = $(SUBDIRS)
EXTRA_DIST= \
......@@ -77,11 +77,12 @@ VlcClient: $(OBJECTS)
VLCExample: $(OBJECTS)
$(JAVAC) VLCExample.java
.class:
class: %.java
$(JAVAC) $?
$(JCH) org/videolan/jvlc/$$(basename $*) -o includes/$$(basename $*).h
$(JCH) $(@D)/$(*F) -o includes/$(*F).h
clean-local:
rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h *.so *.o *.dll
rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h includes/*.h src/*.o *.so *.o *.dll
endif
......@@ -13,7 +13,7 @@ EXTRA_DIST= \
if BUILD_JAVA
JAVACXXFLAGS = `top_builddir=../../.. ../../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES) -c
JAVACXXFLAGS = `top_builddir=../../.. ../../../vlc-config --cflags pic` -I. -Isrc -I../../ -I ../../include $(JINCLUDES) -c
all: $(COBJECTS)
......
......@@ -83,7 +83,7 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLC__1destroy (JNIEnv *env, jobje
instance = getClassInstance( env, _this );
libvlc_destroy( (libvlc_instance_t *) instance, NULL );
libvlc_destroy( (libvlc_instance_t *) instance, NULL);
return;
}
......
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