Fixed XCode project, and don't build libmp4v2 anymore

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/avformat@51 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/Jamfile b/contrib/Jamfile
index fc68ae44046b32a32ccae5fa7e08619dba02f7e0..0e28e5beca10cc1bf00a2a096237b12dfd4523e1 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -158,25 +158,6 @@ actions LibMp3Lame
 Wget       $(SUBDIR)/lame.tar.gz      : $(SUBDIR)/version_lame.txt ;
 LibMp3Lame $(SUBDIR)/lib/libmp3lame.a : $(SUBDIR)/lame.tar.gz ;
 
-# libmp4v2
-rule LibMp4v2
-{
-    Depends $(<) : $(>) ;
-    Depends lib  : $(<) ;
-}
-actions LibMp4v2
-{
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
-    ./bootstrap && make -C lib/mp4v2 libmp4v2.la &&
-    cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
-    cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
-      include/mpeg4ip_win32.h lib/mp4v2/mp4.h $CONTRIB/include &&
-    strip -S $CONTRIB/lib/libmp4v2.a
-}
-Wget     $(SUBDIR)/mpeg4ip.tar.gz : $(SUBDIR)/version_mpeg4ip.txt ;
-LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/mpeg4ip.tar.gz ;
-
 # libmpeg2
 rule LibMpeg2
 {

diff --git a/contrib/version_mpeg4ip.txt b/contrib/version_mpeg4ip.txt
deleted file mode 100644 (file)
index f60e597..0000000
--- a/contrib/version_mpeg4ip.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://download.m0k.org/handbrake/contrib/mpeg4ip-1.3.tar.gz

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index de534843801635535f379efa9b3b385391720c1e..e9eeb94d7d8d10ee1a5fd37824f434ff2e7b73b7 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
        objects = {
 
 /* Begin PBXBuildFile section */
+               4D1125D809D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
+               4D1125D909D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
                4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; };
                4D1EA2F60993B0CA00FDC1A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
                4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA3000993B13700FDC1A2 /* Express.nib */; };
@@ -73,6 +75,7 @@
                29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
                29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+               4D1125D709D72FD200E0657B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
                4D118405053054CD00C39CA9 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
                4D1EA2DA0993B01000FDC1A2 /* HandBrake Express.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HandBrake Express.app"; sourceTree = BUILT_PRODUCTS_DIR; };
                4D1EA2DC0993B01000FDC1A2 /* Express.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Express.plist; sourceTree = "<group>"; };
@@ -108,6 +111,7 @@
                        files = (
                                4D1EA2F60993B0CA00FDC1A2 /* Cocoa.framework in Frameworks */,
                                4D2AEA1A09CCB332007E18F6 /* IOKit.framework in Frameworks */,
+                               4D1125D909D72FD200E0657B /* libz.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -118,6 +122,7 @@
                                4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */,
                                4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */,
                                4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */,
+                               4D1125D809D72FD200E0657B /* libz.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -194,6 +199,7 @@
                29B97323FDCFA39411CA2CEA /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               4D1125D709D72FD200E0657B /* libz.dylib */,
                                1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
                                4DEB2024052B055F00C39CA9 /* IOKit.framework */,
                                4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */,
@@ -305,13 +311,13 @@
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -448,13 +454,13 @@
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -485,13 +491,13 @@
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -520,13 +526,13 @@
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -560,13 +566,13 @@
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -602,13 +608,13 @@
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,
@@ -642,13 +648,13 @@
                                OTHER_LDFLAGS = (
                                        ../libhb/libhb.a,
                                        ../contrib/lib/liba52.a,
+                                       ../contrib/lib/libavformat.a,
                                        ../contrib/lib/libavcodec.a,
                                        ../contrib/lib/libavutil.a,
                                        ../contrib/lib/libdvdread.a,
                                        ../contrib/lib/libdvdcss.a,
                                        ../contrib/lib/libfaac.a,
                                        ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmp4v2.a,
                                        ../contrib/lib/libmpeg2.a,
                                        ../contrib/lib/libvorbis.a,
                                        ../contrib/lib/libvorbisenc.a,