From fef167824f93d43e6f6ab5d8e9ca167de3c92288 Mon Sep 17 00:00:00 2001 From: saintdev Date: Sun, 23 Mar 2008 23:54:33 +0000 Subject: [PATCH] Fix Makefiles for dynamically linked dvdcss. You can only build dynamically linked dvdcss with make. If you want static dvdcss use jam. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1362 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/Makefile | 14 -------------- test/Makefile | 9 +++------ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/libhb/Makefile b/libhb/Makefile index fb05e5a50..28b8d5c00 100644 --- a/libhb/Makefile +++ b/libhb/Makefile @@ -29,7 +29,6 @@ SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c enctheora.c \ OTMP = $(SRCS:%.c=%.o) OBJS = $(OTMP:%.cpp=%.o) -ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT) CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \ ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \ ../contrib/lib/libdca.a ../contrib/lib/libdvdread.a \ @@ -41,19 +40,6 @@ CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \ ../contrib/lib/libxvidcore.a ../contrib/lib/libmp4v2.a \ ../contrib/lib/libmkv.a ../contrib/lib/libswscale.a \ ../contrib/lib/libtheora.a -else -CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \ - ../contrib/lib/libavcodec.a ../contrib/lib/libavutil.a \ - ../contrib/lib/libdca.a ../contrib/lib/libdvdread.a \ - ../contrib/lib/libdvdcss.a ../contrib/lib/libfaac.a \ - ../contrib/lib/libmp3lame.a ../contrib/lib/libmpeg2.a \ - ../contrib/lib/libmpeg2convert.a ../contrib/lib/libvorbis.a \ - ../contrib/lib/libvorbisenc.a ../contrib/lib/libvorbisfile.a \ - ../contrib/lib/libogg.a ../contrib/lib/libsamplerate.a \ - ../contrib/lib/libx264.a ../contrib/lib/libxvidcore.a \ - ../contrib/lib/libmp4v2.a ../contrib/lib/libmkv.a \ - ../contrib/lib/libswscale.a ../contrib/lib/libtheora.a -endif CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF) diff --git a/test/Makefile b/test/Makefile index 472eb5bc0..3a5b39c1c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,17 +1,14 @@ SYSTEM = $(shell uname -s) -ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT) - LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale -else - LIBS = a52 mkv avformat avcodec avutil dca dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale -endif +LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis \ + vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale all: ../HandBrakeCLI CFLAGS += -I../libhb CXXFLAGS += -I../libhb LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a) -LDFLAGS += $(LIBS2) +LDFLAGS += $(LIBS2) -ldl ../HandBrakeCLI: test.c parsecsv.c $(LIBS2) @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \ -- 2.40.0