Skip to content

Commit 1df5415

Browse files
author
Andrea Medeghini
committed
Cleanup
1 parent 1701722 commit 1df5415

5 files changed

Lines changed: 4 additions & 6 deletions

File tree

‎Makefile.jni.linux‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/linux
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.so -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lswresample -lstdc++ -lm -lz
8+
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.so -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -fPIC -shared -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample -lstdc++ -lm -lz -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lswresample $(BUILD_DIR)/ffmpeg4java_wrap.c

‎Makefile.jni.macos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ JAVA_HOME=`/usr/libexec/java_home`
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/macos
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.jnilib -std=gnu99 -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lswresample -lm -lz -lbz2 -liconv -framework VideoToolbox -framework AudioToolbox -framework AVFoundation -framework Foundation -framework CoreImage -framework CoreGraphics -framework CoreMedia -framework QuartzCore -framework OpenGL -framework OpenAL -framework VideoDecodeAcceleration -framework QTKit -framework AppKit -framework Security
8+
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.jnilib -std=gnu99 -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -fPIC -shared -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lswresample -lm -lz -lbz2 -liconv -framework VideoToolbox -framework AudioToolbox -framework AVFoundation -framework Foundation -framework CoreImage -framework CoreGraphics -framework CoreMedia -framework QuartzCore -framework OpenGL -framework OpenAL -framework VideoDecodeAcceleration -framework QTKit -framework AppKit -framework Security
99

‎Makefile.jni.mingw64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/win32
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && x86_64-w64-mingw32-gcc --verbose -o $(OUTPUT_DIR)/ffmpeg4java.dll -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,--out-implib=libffmpeg4java.dll.a -Wl,-add-stdcall-alias -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample $(BUILD_DIR)/ffmpeg4java_wrap.c -lavformat -lavdevice -lavfilter -lavcodec -lavutil -lswscale -lswresample -lm -lws2_32 -luuid -lsecur32 -lshlwapi -lgdi32 -lopengl32 -lstrmiids -lole32 -loleaut32 -lquartz -lavifil32 -lmsvfw32 -lavicap32
8+
mkdir -p $(OUTPUT_DIR) && x86_64-w64-mingw32-gcc --verbose -o $(OUTPUT_DIR)/ffmpeg4java.dll -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,--out-implib=libffmpeg4java.dll.a -Wl,-add-stdcall-alias -fPIC -shared -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample $(BUILD_DIR)/ffmpeg4java_wrap.c -lavformat -lavdevice -lavfilter -lavcodec -lavutil -lswscale -lswresample -lm -lws2_32 -luuid -lsecur32 -lshlwapi -lgdi32 -lopengl32 -lstrmiids -lole32 -loleaut32 -lquartz -lavifil32 -lmsvfw32 -lavicap32

‎Makefile.lib.linux‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@ LIB_ARCH=x86_$(LIB_TYPE)
44

55
ffmpeg:
66
./configure --extra-cflags=-m$(LIB_TYPE) --extra-ldflags=-m$(LIB_TYPE) --arch=$(LIB_ARCH) --disable-mmx --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-pthreads --enable-static --disable-shared --enable-pic && make
7-
8-

‎Makefile.lib.mingw64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ LIB_TYPE=64
33
LIB_ARCH=x86_$(LIB_TYPE)
44

55
ffmpeg:
6-
./configure --cross-prefix=$(LIB_ARCH)-w64-mingw32- --extra-cflags=-m$(LIB_TYPE) --extra-ldflags=-m$(LIB_TYPE) --arch=$(LIB_ARCH) --enable-cross-compile --target-os=mingw32 --disable-mmx --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-memalign-hack --enable-w32threads --enable-static --disable-shared && make
6+
./configure --cross-prefix=$(LIB_ARCH)-w64-mingw32- --extra-cflags=-m$(LIB_TYPE) --extra-ldflags=-m$(LIB_TYPE) --arch=$(LIB_ARCH) --enable-cross-compile --target-os=mingw32 --disable-mmx --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-memalign-hack --enable-w32threads --enable-static --disable-shared --enable-pic && make
77

88

0 commit comments

Comments
 (0)