diff options
| author | Rodeo <[email protected]> | 2013-08-22 20:33:35 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-08-22 20:33:35 +0000 |
| commit | d41905d539046445e1b81499ff7bd04d170c91d4 (patch) | |
| tree | 3f39a09e757bca8bc461d46303a2cb1c35e8d9a6 /libhb/module.defs | |
| parent | c1a493b581f0567eba92625f2ee132de8e7f1d6d (diff) | |
Big merge, QSV to trunk: part 1 (tracked files).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5737 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/module.defs')
| -rw-r--r-- | libhb/module.defs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index afaf6ffd1..b161f4c7f 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -1,6 +1,6 @@ __deps__ := A52DEC BZIP2 FAAC FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \ LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \ - MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC + MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC LIBMFX $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__))) $(eval $(call import.GCC,LIBHB)) @@ -13,7 +13,12 @@ LIBHB.build/ = $(BUILD/)libhb/ LIBHB.m4.in = $(wildcard $(LIBHB.src/)*.m4) LIBHB.m4.out = $(patsubst $(LIBHB.src/)%.m4,$(LIBHB.build/)%,$(LIBHB.m4.in)) +ifeq (1,$(FEATURE.qsv)) LIBHB.c = $(wildcard $(LIBHB.src/)*.c) +else +LIBHB.c = $(filter-out $(wildcard $(LIBHB.src/)*qsv*.c), $(wildcard $(LIBHB.src/)*.c)) +endif + LIBHB.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(LIBHB.c)) LIBHB.d = $(LIBHB.m4.out) $(LIBHB.h.out) \ $(foreach n,$(LIBHB.prerequisites),$($n.INSTALL.target) ) @@ -74,6 +79,10 @@ else LIBHB.platform.D = SYS_UNKNOWN endif +ifeq (1,$(FEATURE.qsv)) + LIBHB.GCC.D += USE_QSV HAVE_THREADS=1 +endif + ## required for <libdvdread/*.h> ifneq (,$(filter $(BUILD.arch),ppc ppc64)) LIBHB.GCC.D += WORDS_BIGENDIAN @@ -123,6 +132,10 @@ ifeq (1,$(FEATURE.faac)) LIBHB.dll.libs += $(CONTRIB.build/)lib/libfaac.a endif +ifeq (1,$(FEATURE.qsv)) +LIBHB.dll.libs += $(CONTRIB.build/)lib/libmfx.a +endif + ifeq (1,$(FEATURE.mp4v2)) LIBHB.dll.libs += $(CONTRIB.build/)lib/libmp4v2.a endif |