x264 bump to r1101

[handbrake-jp/handbrake-jp-git.git] / libhb / Makefile

diff --git a/libhb/Makefile b/libhb/Makefile
index fb05e5a..9992d7c 100644 (file)
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -25,11 +25,11 @@ SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c enctheora.c \
           update.c demuxmpeg.c fifo.c render.c reader.c muxcommon.c stream.c \
           muxmp4.c sync.c decsub.c deca52.c decdca.c encfaac.c declpcm.c encx264.c \
           decavcodec.c encxvid.c muxmkv.c muxavi.c enclame.c muxogm.c encvorbis.c \
-          dvd.c  ipodutil.cpp deblock.c deinterlace.c denoise.c detelecine.c lang.c
+          dvd.c deblock.c deinterlace.c denoise.c detelecine.c decomb.c lang.c \
+          decmetadata.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  \
@@ -40,29 +40,20 @@ CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.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
-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
+                  ../contrib/lib/libtheora.a ../contrib/lib/libfaad.a
+                  
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+       CONTRIBS += ../contrib/lib/libz.a ../contrib/lib/libbz2.a
 endif
 
-CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)
+CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD $(SYSDEF) -Wall -g -O3 -funroll-loops
 
-CXXFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD -DHB_VERSION=\"$(HB_VERSION)\" -DHB_BUILD=$(HB_BUILD) $(SYSDEF)
+CXXFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD $(SYSDEF)
 
 ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
 all: libhb.a libhb.dll
 else
-all: libhb.a libhb.so
+all: libhb.a
 
 endif