X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=libhb%2FMakefile;h=9992d7cd58b285f8375b2b31caa292a94b6ad112;hb=f9341345b37e0738a140423297c222a7e40eddab;hp=deba9a30b87510889910d3a20d804da3f7bbe493;hpb=53e2779d92fae78e365b89358ee55b08eeb3c340;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/Makefile b/libhb/Makefile
index deba9a30..9992d7cd 100644
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.config
 
 SYSTEM = $(shell uname -s)
 
-ifeq ($(SYSTEM),CYGWIN_NT-5.1)
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
 	SYSDEF=-DSYS_CYGWIN
 endif
 
@@ -21,15 +21,15 @@ ifeq ($(SYSTEM),Linux)
 	LDFLAGS += -lpthread -lm -ldl
 endif
 
-SRCS = common.c hb.c ports.c scan.c work.c decmpeg2.c encavcodec.c \
+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
+	   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 ($(SYSTEM),CYGWIN_NT-5.1)
 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  \
@@ -39,25 +39,21 @@ CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.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
-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/libmkv.a ../contrib/lib/libswscale.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 ($(SYSTEM),CYGWIN_NT-5.1)
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
 all: libhb.a libhb.dll
 else
-all: libhb.a libhb.so
+all: libhb.a
 
 endif