diff options
author | konablend <[email protected]> | 2009-03-01 17:03:11 +0000 |
---|---|---|
committer | konablend <[email protected]> | 2009-03-01 17:03:11 +0000 |
commit | 4dbce6b69967c1e14092637aa95b6c31855a81fc (patch) | |
tree | 516c17095967698eeb419c70ce72dbd2c11bf754 /test/module.defs | |
parent | c47939541ccec1e5e57753b16b28baed2613f586 (diff) |
BuildSystem: conversion from jam-based to make-based system.
KNOWN ISSUES:
1. OSX + Xcode builds do not support parallel builds; attempting to
use them may cause unbounded number of jobs. However, disabling
via configure --disable-xcode avoids the issue.
2. OSX ppc binary produces binary which has audio-scan problems.
3. OSX ppc64 binary has not been runtime tested.
ADDED:
00-BuildUserGuide.txt
contrib/*/module.*
doc/
make/
libhb/module.*
test/module.*
macos/module.*
gtk/module.*
DROPPED:
BUILD
BuildContribDarwin.sh
DownloadMacOsXContribBinaries.sh
Jamfile
Jamrules
MacOsXContribBinariesVersion.txt
Makefile
Makefile.config
jam
libhb/Jamefile
libhb/Makefile
test/BUILDSHARED
test/Makefile
contrib/Jamfile
contrib/Makefile
contrib/patch-ffmpeg.patch
contrib/patch-x264-idr.patch
contrib/patch-x264-linux.patch
RENAMED:
contrib/*.patch -> contrib/MODULE/[AP]??-*.patch
macosx/HandBrake.plist -> macosx/Info.plist
MODIFIED: libhb/decavcodec.c
Patched to use cleaner include "libavcodec/audioconvert".
Second part to support this cleanup is ffmpeg A02-audioconvert.patch .
MODIFIED: libhb/hb.c
MODIFIED: libhb/hb.h
MODIFIED: libhb/muxmkv.c
MODIFIED: libhb/muxmp4.c
MODIFIED: libhb/update.c
Patched to use "project.h" for project metadata.
Renamed HB_BUILD -> HB_PROJECT_BUILD.
Renamed HB_VERSION -> HB_PROJECT_VERSION.
MODIFIED: test/test.c:
Patched HandBrakeCLI to support I/O on Mac OS X ZFS filesystems.
Reference r1803 as similar patch for HandBrake.app .
Unpatched behavior is crash/buserror when using ZFS.
MODIFIED: macosx/Growl.framework/
Upgraded 0.7.6 (i386,ppc) -> 1.1.2 (i386,x86_64,ppc,ppc64).
New architectures facilitate x86_64 and ppc64 builds.
MODIFIED: macosx/HandBrake.xcodeproj/
Bumped compatibilty mode from 2.4 -> 3.1 .
Dumped old configurations Deployment, Developer.
Added configurations standard, sebug as replacements.
Added standard.i386, standard.x86_64, standard.ppc, standard.ppc64 .
for explicit architecture build.
All configurations settings cleaned up and normalized.
Build output directories adjusted to support new build system.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2180 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test/module.defs')
-rw-r--r-- | test/module.defs | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/test/module.defs b/test/module.defs new file mode 100644 index 000000000..3eda79509 --- /dev/null +++ b/test/module.defs @@ -0,0 +1,41 @@ +$(eval $(call import.MODULE.defs,TEST,test,LIBHB)) +$(eval $(call import.GCC,TEST)) + +TEST.src/ = $(PROJECT/)test/ +TEST.build/ = $(BUILD/)test/ + +TEST.c = $(wildcard $(TEST.src/)*.c) +TEST.c.o = $(patsubst $(PROJECT/)%.c,$(BUILD/)%.o,$(TEST.c)) + +TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI) + +TEST.libs = $(LIBHB.a) $(foreach n, \ + a52 avcodec avformat avutil dca dvdread faac faad mkv mpeg2 mp3lame mp4v2 \ + ogg samplerate swscale theora vorbis vorbisenc x264 xvidcore, \ + $(CONTRIB.build/)lib/lib$(n).a ) + +## add libs from optional modules +ifeq (1,$(BZIP2.enabled)) + TEST.libs += $(CONTRIB.build/)lib/libbz2.a +endif +ifeq (1,$(ZLIB.enabled)) + TEST.libs += $(CONTRIB.build/)lib/libz.a +endif + +############################################################################### + +TEST.out += $(TEST.c.o) +TEST.out += $(TEST.exe) + +BUILD.out += $(TEST.out) + +############################################################################### + +TEST.GCC.I += $(LIBHB.GCC.I) + +ifeq ($(BUILD.system),darwin) + TEST.GCC.f += IOKit CoreServices + TEST.GCC.l += bz2 z +else ifeq ($(BUILD.system),linux) + TEST.GCC.l += bz2 z pthread dl m +endif |