diff options
author | konablend <[email protected]> | 2009-03-08 22:50:57 +0000 |
---|---|---|
committer | konablend <[email protected]> | 2009-03-08 22:50:57 +0000 |
commit | 083ba4898a662cd50a86d2a65ca5ebe765fe882d (patch) | |
tree | c2460805275e7b23dd03965df15beecc7ac4589b /libhb | |
parent | 92d511d944b059caaf6c5e85fcb5202642aa4553 (diff) |
BuildSystem: general, configure and Xcode updates.
*** NOTICE:
This changeset requires a clean build directory. Please issue 'make xclean' inside
build dir(s) after 'svn up'. This will help ensure there are no unexpected results.
*** GENERAL:
- renamed makevar PROJECT/ -> SRC/ for clarity.
- renamed makevar PREFIX.install/ -> PREFIX/ for clarity.
- split custom GNUmakefile overrides into defs/rules files.
- inserted optional level of make customization at SRC/ level; see docs.
- dropped HB.repo.wcversion (svnversion is no longer used).
- corrected several 'rm' usages to use -f flag which avoids some build errors.
- refreshed generated 00-Building.*.txt docs; work still in progress on the wiki front.
*** CONFIGURE:
- made configure more robust; configure may now be run outside of build directory!
- adding log recording of configure activities.
- improved readability of default options for configure
- added:
--force overwrite existing build config
--src=DIR specify top-level source dir [.]
--build=DIR specify build scratch/output dir [.]
--prefix=DIR specify install dir for products [/Applications]
- dropped --launch-force (replaced by --force)
- dropped --launch-dir (replaced by --build)
- dropped --launch-log
*** XCODE:
- renamed pbxproj definition EXTERNAL_PROJECT -> EXTERNAL_SRC for clarity.
- fixed all configurations to default to EXTERNAL_JOBS=1 .
- enabled Xcode internal parallelization (libhb, HandBrakeCLI and HandBrake benefit).
- make now tickles Xcode build files to cause Info.plist regeneration and posting to HandBrake.app output;
ie: svn up; click build and HandBrake.app's about panel will reflect the new repository rev.
*** DARWIN:
- added support to build universal binaries; see docs.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2242 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r-- | libhb/module.defs | 6 | ||||
-rw-r--r-- | libhb/module.rules | 4 | ||||
-rw-r--r-- | libhb/project.h.m4 | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index e36d1a883..9853a1027 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -1,14 +1,14 @@ $(eval $(call import.MODULE.defs,LIBHB,libhb,A52DEC BZIP2 FAAC FAAD2 FFMPEG LAME LIBDCA LIBDVDREAD LIBMKV LIBMP4V2 LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS MPEG2DEC X264 XVIDCORE ZLIB LIBHB TEST DOC)) $(eval $(call import.GCC,LIBHB)) -LIBHB.src/ = $(PROJECT/)libhb/ +LIBHB.src/ = $(SRC/)libhb/ LIBHB.build/ = $(BUILD/)libhb/ LIBHB.m4.in = $(wildcard $(LIBHB.src/)*.m4) LIBHB.m4.out = $(patsubst $(LIBHB.src/)%.m4,$(LIBHB.build/)%,$(LIBHB.m4.in)) LIBHB.c = $(wildcard $(LIBHB.src/)*.c) -LIBHB.c.o = $(patsubst $(PROJECT/)%.c,$(BUILD/)%.o,$(LIBHB.c)) +LIBHB.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(LIBHB.c)) LIBHB.d = $(LIBHB.m4.out) $(LIBHB.h.out) \ $(foreach n, \ A52DEC BZIP2 FAAC FAAD2 FFMPEG LAME LIBDCA LIBDVDREAD LIBMKV LIBMP4V2 LIBOGG \ @@ -16,7 +16,7 @@ LIBHB.d = $(LIBHB.m4.out) $(LIBHB.h.out) \ $($n.INSTALL.target) ) LIBHB.h.in = $(wildcard $(LIBHB.src/)*.h) -LIBHB.h.out = $(patsubst $(PROJECT/)%,$(BUILD/)%,$(LIBHB.h.in)) +LIBHB.h.out = $(patsubst $(SRC/)%,$(BUILD/)%,$(LIBHB.h.in)) ############################################################################### diff --git a/libhb/module.rules b/libhb/module.rules index 396deb09b..7ac6e3f5a 100644 --- a/libhb/module.rules +++ b/libhb/module.rules @@ -8,7 +8,7 @@ $(LIBHB.a): $(LIBHB.c.o) $(LIBHB.c.o): $(LIBHB.d) $(LIBHB.c.o): | $(dir $(LIBHB.c.o)) -$(LIBHB.c.o): $(BUILD/)%.o: $(PROJECT/)%.c +$(LIBHB.c.o): $(BUILD/)%.o: $(SRC/)%.c $(call LIBHB.GCC.C_O,$@,$<) $(LIBHB.m4.out): $(BUILD/)project/handbrake.m4 @@ -17,7 +17,7 @@ $(LIBHB.m4.out): $(LIBHB.build/)%: $(LIBHB.src/)%.m4 $(M4.exe) -Iproject $< > $@ $(LIBHB.h.out): | $(dir $(LIBHB.h.out)) -$(LIBHB.h.out): $(BUILD/)%: $(PROJECT/)% +$(LIBHB.h.out): $(BUILD/)%: $(SRC/)% $(CP.exe) $< $@ libhb.clean: diff --git a/libhb/project.h.m4 b/libhb/project.h.m4 index 73388fd39..a7baa221b 100644 --- a/libhb/project.h.m4 +++ b/libhb/project.h.m4 @@ -25,7 +25,6 @@ dnl <<#>>define HB_PROJECT_REPO_UUID "__HB_repo_uuid" <<#>>define HB_PROJECT_REPO_REV __HB_repo_rev <<#>>define HB_PROJECT_REPO_DATE "__HB_repo_date" -<<#>>define HB_PROJECT_REPO_WCVERSION "__HB_repo_wcversion" <<#>>define HB_PROJECT_REPO_OFFICIAL __HB_repo_official <<#>>define HB_PROJECT_REPO_TYPE "__HB_repo_type" |