X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=libhb%2Fmodule.defs;h=f3da3c0ba18ae46acf17492af1fc65837165efd0;hb=5a8c3011c696864010f1d819ac4513c90ff2a97c;hp=dc2fb1ad528d3ca2df151a3088e0c00e4bc610c8;hpb=c593146bf3fab6290c71cbbb974e0a756e43f5e0;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/module.defs b/libhb/module.defs
index dc2fb1ad..f3da3c0b 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -1,6 +1,6 @@
 __deps__ := A52DEC BZIP2 FAAC FAAD2 FFMPEG LAME LIBDCA \
-    LIBDVDREAD LIBMKV LIBMP4V2 LIBOGG LIBSAMPLERATE LIBTHEORA \
-    LIBVORBIS MPEG2DEC PTHREADW32 X264 XVIDCORE ZLIB
+    LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS \
+    MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB
 
 $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
 $(eval $(call import.GCC,LIBHB))
@@ -41,6 +41,7 @@ ifeq ($(BUILD.system),cygwin)
     LIBHB.GCC.D += SYS_CYGWIN
 else ifeq ($(BUILD.system),darwin)
     LIBHB.GCC.D += SYS_DARWIN
+    LIBHB.c += $(wildcard $(LIBHB.src/)platform/macosx/*.c)
 else ifeq ($(BUILD.system),linux)
     LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
 else ifeq ($(BUILD.system),mingw)
@@ -87,8 +88,8 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
 LIBHB.lib = $(LIBHB.build/)hb.lib
 
 LIBHB.dll.libs = $(foreach n, \
-        a52 bz2 avcodec avformat avutil dca dvdread faac faad mkv mpeg2 mp3lame mp4v2 \
-        ogg pthreadGC2 samplerate swscale theora vorbis vorbisenc x264 xvidcore z, \
+        a52 bz2 avcodec avformat avutil dca dvdnav dvdread faac faad iconv mkv mpeg2 mp3lame mp4v2 \
+        ogg pthreadGC2 samplerate swscale theora vorbis vorbisenc x264 z, \
         $(CONTRIB.build/)lib/lib$(n).a )
 
 LIBHB.GCC.args.extra.dylib++ = -Wl,--out-implib,$(LIBHB.lib)