OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WinGui:
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
module.defs
diff --git
a/libhb/module.defs
b/libhb/module.defs
index
e5ecf97
..
e73102c
100644
(file)
--- a/
libhb/module.defs
+++ b/
libhb/module.defs
@@
-1,6
+1,6
@@
__deps__ := A52DEC BZIP2 FAAC FAAD2 FFMPEG LAME LIBDCA \
__deps__ := A52DEC BZIP2 FAAC FAAD2 FFMPEG LAME LIBDCA \
- LIBDVDREAD LIBDVDNAV LIB
MKV LIBMP4V2 LIBOGG LIBSAMPLERATE LIBTHEORA
\
-
LIBVORBIS MPEG2DEC PTHREADW32 X264 XVIDCORE
ZLIB
+ LIBDVDREAD LIBDVDNAV LIB
ICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS
\
+
MP4V2 MPEG2DEC PTHREADW32 X264
ZLIB
$(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
$(eval $(call import.GCC,LIBHB))
$(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
$(eval $(call import.GCC,LIBHB))
@@
-46,6
+46,7
@@
else ifeq ($(BUILD.system),linux)
LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
else ifeq ($(BUILD.system),mingw)
LIBHB.GCC.D += SYS_MINGW PTW32_STATIC_LIB
LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
else ifeq ($(BUILD.system),mingw)
LIBHB.GCC.D += SYS_MINGW PTW32_STATIC_LIB
+ LIBHB.GCC.args.extra.dylib++ += -Wl,--enable-auto-import
else ifeq ($(BUILD.system),solaris)
LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
else
else ifeq ($(BUILD.system),solaris)
LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
else
@@
-88,11
+89,11
@@
LIBHB.dll = $(LIBHB.build/)hb.dll
LIBHB.lib = $(LIBHB.build/)hb.lib
LIBHB.dll.libs = $(foreach n, \
LIBHB.lib = $(LIBHB.build/)hb.lib
LIBHB.dll.libs = $(foreach n, \
- a52 bz2 avcodec avformat avutil dca dvdnav 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 )
$(CONTRIB.build/)lib/lib$(n).a )
-LIBHB.GCC.args.extra.dylib++ = -Wl,--out-implib,$(LIBHB.lib)
+LIBHB.GCC.args.extra.dylib++
+
= -Wl,--out-implib,$(LIBHB.lib)
LIBHB.GCC.l += iberty ws2_32
LIBHB.out += $(LIBHB.dll) $(LIBHB.lib)
LIBHB.GCC.l += iberty ws2_32
LIBHB.out += $(LIBHB.dll) $(LIBHB.lib)