diff options
| author | konablend <[email protected]> | 2009-03-20 07:39:32 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2009-03-20 07:39:32 +0000 |
| commit | 1631d2c17dee0fa3fdaf6e9c493f79bac82a68df (patch) | |
| tree | dd41fa9d75670064f3d1972cd6baba2feec0a1f6 | |
| parent | 332fe460eaa2d3e537ecc27897a88011a17e6f0a (diff) | |
Cygwin: updated patch to support faac-1.26 -> 1.28 bump.
BuildSystem: cleanup some makefile debug residuals and fix module bzip2 always-out-of-date condition.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2268 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/bzip2/module.defs | 2 | ||||
| -rw-r--r-- | contrib/faac/P00-cygwin.patch | 10 | ||||
| -rw-r--r-- | libhb/module.rules | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs index 4384f83f7..7c9c5528b 100644 --- a/contrib/bzip2/module.defs +++ b/contrib/bzip2/module.defs @@ -3,7 +3,7 @@ $(eval $(call import.CONTRIB.defs,BZIP2)) BZIP2.FETCH.url = http://download.m0k.org/handbrake/contrib/bzip2-1.0.5.tar.gz BZIP2.EXTRACT.tarbase = bzip2 -BZIP2.CONFIGURE = +BZIP2.CONFIGURE = $(TOUCH.exe) $@ BZIP2.BUILD.extra = \ CC=$(BZIP2.GCC.gcc) \ diff --git a/contrib/faac/P00-cygwin.patch b/contrib/faac/P00-cygwin.patch index d54b08d02..a5da42d87 100644 --- a/contrib/faac/P00-cygwin.patch +++ b/contrib/faac/P00-cygwin.patch @@ -1,12 +1,12 @@ -diff -Naur faac2/include/faac.h faac3/include/faac.h ---- faac/include/faac.h 2004-07-04 13:12:06.000000000 +0100 -+++ faac/include/faac.h 2008-08-17 19:56:29.734375000 +0100 +diff -Naur faac-1.28.orig/include/faac.h faac-1.28/include/faac.h +--- faac-1.28.orig/include/faac.h 2009-01-25 13:50:32.000000000 -0500 ++++ faac-1.28/include/faac.h 2009-03-20 03:31:46.000000000 -0400 @@ -50,7 +50,7 @@ typedef void *faacEncHandle; #ifndef HAVE_INT32_T --typedef int int32_t; -+//typedef int int32_t; +-typedef signed int int32_t; ++//typedef signed int int32_t; #endif /* diff --git a/libhb/module.rules b/libhb/module.rules index 6408700e4..8f63a143f 100644 --- a/libhb/module.rules +++ b/libhb/module.rules @@ -38,7 +38,3 @@ endif clean: libhb.clean build: libhb.build - -xmike: - @echo $(LIBHB.yasm.asm) - @echo $(LIBHB.yasm.o) |