summaryrefslogtreecommitdiffstats
path: root/libhb/Makefile
diff options
context:
space:
mode:
authorsaintdev <[email protected]>2008-03-23 23:54:33 +0000
committersaintdev <[email protected]>2008-03-23 23:54:33 +0000
commitfef167824f93d43e6f6ab5d8e9ca167de3c92288 (patch)
treeba879148b66787be64a12381628422670a929db5 /libhb/Makefile
parent9b6a698b3a9da70e0cd8095bd20e05ddb655e85e (diff)
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
Diffstat (limited to 'libhb/Makefile')
-rw-r--r--libhb/Makefile14
1 files changed, 0 insertions, 14 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)