mirror of
https://github.com/videolan/vlc.git
synced 2025-01-19 06:08:18 +08:00
dirty fix to correctly link libvlc-control during make
This commit is contained in:
parent
e131931fa3
commit
ceba8717d0
@ -47,13 +47,13 @@ JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
|
||||
LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
|
||||
JCH = javah
|
||||
JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
|
||||
JAVALDFLAGS = -mno-cygwin -L../../src -lvlc -lvlc-control `top_builddir=../.. ../../vlc-config --libs builtin vlc pic external` -Wl,--kill-at
|
||||
JAVALDFLAGS = -mno-cygwin -L../../src -L../../src/.libs -lvlc-control `top_builddir=../.. ../../vlc-config --libs builtin vlc pic external` -Wl,--kill-at
|
||||
else
|
||||
JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
||||
LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt
|
||||
JCH = gcjh -jni
|
||||
JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
|
||||
JAVALDFLAGS = -L../../src -lvlc -lvlc-control `top_builddir=../.. ../../vlc-config --libs builtin vlc pic external`
|
||||
JAVALDFLAGS = -L../../src -L../../src/.libs -lvlc-control `top_builddir=../.. ../../vlc-config --libs builtin vlc pic external`
|
||||
endif
|
||||
|
||||
export JINCLUDES
|
||||
|
Loading…
Reference in New Issue
Block a user