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 /make/include/main.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 'make/include/main.defs')
-rw-r--r-- | make/include/main.defs | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/make/include/main.defs b/make/include/main.defs new file mode 100644 index 000000000..c40e2b62a --- /dev/null +++ b/make/include/main.defs @@ -0,0 +1,75 @@ +.DELETE_ON_ERROR: +.SUFFIXES: + +.PHONY: build +build: + +############################################################################### + +include $(PROJECT/)make/include/base.defs +include $(PROJECT/)make/include/contrib.defs +include $(PROJECT/)make/include/function.defs +include $(PROJECT/)make/include/gcc.defs +include $(PROJECT/)make/include/select.defs +include $(PROJECT/)make/include/target.defs +include $(PROJECT/)make/include/tool.defs + +############################################################################### + +MODULES += contrib/a52dec + +ifneq (,$(filter $(BUILD.system),cygwin)) + MODULES += contrib/bzip2 +endif + +MODULES += contrib/faac +MODULES += contrib/faad2 +MODULES += contrib/ffmpeg +MODULES += contrib/lame +MODULES += contrib/libdca +MODULES += contrib/libdvdread +MODULES += contrib/libmkv +MODULES += contrib/libmp4v2 +MODULES += contrib/libogg +MODULES += contrib/libsamplerate +MODULES += contrib/libtheora +MODULES += contrib/libvorbis +MODULES += contrib/mpeg2dec +MODULES += contrib/x264 +MODULES += contrib/xvidcore + +ifneq (,$(filter $(BUILD.system),cygwin)) + MODULES += contrib/zlib +endif + +## these must come after contrib since some contrib modules are optional +MODULES += libhb + +############################################################################### + +## test module is replaced with macosx when Darwin+Xcode +ifneq (,$(filter $(BUILD.system),darwin)) + ifeq (1,$(FEATURE.xcode)) + MODULES += macosx + else + MODULES += test + endif +else + MODULES += test +endif + +ifneq (,$(filter $(BUILD.system),linux)) + ifeq (1,$(FEATURE.gtk)) + MODULES += gtk + endif +endif + +############################################################################### + +MODULES += doc + +############################################################################### + +include $(MODULES:%=$(PROJECT/)%/module.defs) +include $(PROJECT/)make/variant/$(HOST.system).defs +-include $(PROJECT/)make/variant/$(HOST.system).$(BUILD.proc).defs |