rendered paste bodyIndex: macosx/Controller.mm===================================================================--- macosx/Controller.mm (revision 1312)+++ macosx/Controller.mm (working copy)@@ -3206,7 +3206,7 @@ #pragma mark - Required /* These are required by the NSOutlineView Datasource Delegate */ /* We use this to deterimine children of an item */-- (id)outlineView:(NSOutlineView *)fPresetsOutlineView child:(NSInteger)index ofItem:(id)item+- (id)outlineView:(NSOutlineView *)fPresetsOutlineView child:(int/*NSInteger*/)index ofItem:(id)item { if (item == nil) return [UserPresets objectAtIndex:index];Index: macosx/HandBrake.xcodeproj/project.pbxproj===================================================================--- macosx/HandBrake.xcodeproj/project.pbxproj (revision 1312)+++ macosx/HandBrake.xcodeproj/project.pbxproj (working copy)@@ -955,7 +955,7 @@ HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include"; INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = "";- MACOSX_DEPLOYMENT_TARGET = 10.5;+ MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ( "-D__LIBHB__", "-DSYS_DARWIN",@@ -991,7 +991,7 @@ PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN"; PREBINDING = NO; PRODUCT_NAME = hb;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SEPARATE_STRIP = YES; ZERO_LINK = NO; };@@ -1015,7 +1015,7 @@ HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include"; INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = "";- MACOSX_DEPLOYMENT_TARGET = 10.5;+ MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ( "-D__LIBHB__", "-DSYS_DARWIN",@@ -1052,7 +1052,7 @@ PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN"; PREBINDING = NO; PRODUCT_NAME = hb;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SEPARATE_STRIP = YES; ZERO_LINK = NO; };@@ -1074,7 +1074,7 @@ HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include"; INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = "";- MACOSX_DEPLOYMENT_TARGET = 10.5;+ MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ( "-D__LIBHB__", "-DSYS_DARWIN",@@ -1111,7 +1111,7 @@ PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN"; PREBINDING = NO; PRODUCT_NAME = hb;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SEPARATE_STRIP = YES; ZERO_LINK = NO; };@@ -1141,7 +1141,7 @@ PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN"; PREBINDING = NO; PRODUCT_NAME = hb;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = NO; }; name = UB;@@ -1166,7 +1166,7 @@ ); INFOPLIST_FILE = HandBrake.plist; LIBRARY_SEARCH_PATHS = "";- MACOSX_DEPLOYMENT_TARGET = 10.5;+ MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a,@@ -1191,7 +1191,7 @@ ../contrib/lib/libswscale.a, ); PRODUCT_NAME = HandBrake;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( "-Wmost",@@ -1212,6 +1212,7 @@ HEADER_SEARCH_PATHS = ../libhb; INSTALL_PATH = /usr/local/bin; LIBRARY_SEARCH_PATHS = "";+ MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a,@@ -1238,7 +1239,7 @@ ); PREBINDING = NO; PRODUCT_NAME = HandBrakeCLI;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = NO; }; name = UB;@@ -1253,8 +1254,8 @@ GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = "JOB_GROUPS=1"; IBC_NOTICES = NO;- MACOSX_DEPLOYMENT_TARGET = 10.5;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ MACOSX_DEPLOYMENT_TARGET = 10.4;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = UB; };@@ -1284,7 +1285,7 @@ PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN"; PREBINDING = NO; PRODUCT_NAME = hb;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = NO; }; name = Development;@@ -1314,7 +1315,7 @@ PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN"; PREBINDING = NO; PRODUCT_NAME = hb;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = NO; }; name = Deployment;@@ -1332,6 +1333,7 @@ HEADER_SEARCH_PATHS = ../libhb; INSTALL_PATH = /usr/local/bin; LIBRARY_SEARCH_PATHS = "";+ MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a,@@ -1358,7 +1360,7 @@ ); PREBINDING = NO; PRODUCT_NAME = HandBrakeCLI;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = NO; }; name = Development;@@ -1375,6 +1377,7 @@ HEADER_SEARCH_PATHS = ../libhb; INSTALL_PATH = /usr/local/bin; LIBRARY_SEARCH_PATHS = "";+ MACOSX_DEPLOYMENT_TARGET = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a,@@ -1401,7 +1404,7 @@ ); PREBINDING = NO; PRODUCT_NAME = HandBrakeCLI;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = NO; }; name = Deployment;@@ -1430,7 +1433,7 @@ ); INFOPLIST_FILE = HandBrake.plist; LIBRARY_SEARCH_PATHS = "";- MACOSX_DEPLOYMENT_TARGET = 10.5;+ MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a,@@ -1455,7 +1458,7 @@ ../contrib/lib/libswscale.a, ); PRODUCT_NAME = HandBrake;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( "-Wmost",@@ -1489,7 +1492,7 @@ ); INFOPLIST_FILE = HandBrake.plist; LIBRARY_SEARCH_PATHS = "";- MACOSX_DEPLOYMENT_TARGET = 10.5;+ MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( ../libhb/libhb.a,@@ -1514,7 +1517,7 @@ ../contrib/lib/libswscale.a, ); PRODUCT_NAME = HandBrake;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( "-Wmost",@@ -1536,9 +1539,9 @@ GCC_OPTIMIZATION_LEVEL = 0; IBC_NOTICES = NO; IBC_WARNINGS = YES;- MACOSX_DEPLOYMENT_TARGET = 10.5;+ MACOSX_DEPLOYMENT_TARGET = 10.4; PREBINDING = NO;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; ZERO_LINK = NO; }; name = Development;@@ -1549,8 +1552,8 @@ GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = "JOB_GROUPS=1"; IBC_NOTICES = NO;- MACOSX_DEPLOYMENT_TARGET = 10.5;- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;+ MACOSX_DEPLOYMENT_TARGET = 10.4;+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; };Index: macosx/Controller.h===================================================================--- macosx/Controller.h (revision 1312)+++ macosx/Controller.h (working copy)@@ -280,7 +280,7 @@ /* These are required by the NSOutlineView Datasource Delegate */ /* We use this to deterimine children of an item */-- (id)outlineView:(NSOutlineView *)fPresetsOutlineView child:(NSInteger)index ofItem:(id)item;+- (id)outlineView:(NSOutlineView *)fPresetsOutlineView child:(int/*NSInteger*/)index ofItem:(id)item; /* We use this to determine if an item should be expandable */ - (BOOL)outlineView:(NSOutlineView *)fPresetsOutlineView isItemExpandable:(id)item; /* used to specify the number of levels to show for each item */Index: contrib/Jamfile===================================================================--- contrib/Jamfile (revision 1312)+++ contrib/Jamfile (working copy)@@ -5,6 +5,9 @@ if $(OS) = MACOSX { WGET = curl -L -o ;+ SDK = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 ;+ EXTRA_FLAGS = CFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4' LDFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4' ;+ EXTRA_FLAGS2 = --extra-cflags='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4' --extra-ldflags='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4' ; } else {@@ -51,7 +54,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf a52dec && (gzip -dc a52dec.tar.gz | tar xf -) && cd a52dec && $(PATCH) -p1 < ../patch-a52dec.patch &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/liba52.a } Wget $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;@@ -81,7 +84,7 @@ ./configure --prefix=$CONTRIB --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static \ --disable-decoders --enable-decoder=mp2 --disable-parsers --enable-parser=mpegaudio \ --disable-encoders --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \- --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs &&+ --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs $(EXTRA_FLAGS2) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libavcodec.a }@@ -116,7 +119,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && cd libdvdcss &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libdvdcss.a } Wget $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;@@ -134,7 +137,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libdca && (gzip -dc libdca.tar.gz | tar xf - ) && cd libdca && $(PATCH) -p1 < ../patch-libdca.patch &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libdca.a } Wget $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;@@ -153,7 +156,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && cd libdvdread &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libdvdread.a }@@ -184,7 +187,7 @@ { cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libfaac.a }@@ -201,7 +204,7 @@ { cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libmp3lame.a }@@ -222,17 +225,54 @@ Depends $(<) : $(>) ; Depends lib : $(<) ; }-actions LibMp4v2+if $(OS) != CYGWIN && $(OS) != MACOSX {- cd `dirname $(>)` && CONTRIB=`pwd` &&- rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&- cd mpeg4ip && $(LIBMP4V2_PATCH)- ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&- $(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/*.h $CONTRIB/include &&- $(STRIP) $CONTRIB/lib/libmp4v2.a+ actions LibMp4v2+ {+ cd `dirname $(>)` && CONTRIB=`pwd` &&+ rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&+ cd mpeg4ip && $(LIBMP4V2_PATCH)+ ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&+ $(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/*.h $CONTRIB/include &&+ $(STRIP) $CONTRIB/lib/libmp4v2.a+ } }++else if $(OS) = MACOSX+{ + actions LibMp4v2+ {+ # Ugly hack, the bootstrap script does not pass the cflags correctly to the configure script+ # so for now we run configure after bootstrap+ cd `dirname $(>)` && CONTRIB=`pwd` &&+ rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&+ cd mpeg4ip && $(LIBMP4V2_PATCH)+ ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&+ ./configure $(EXTRA_FLAGS) CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" &&+ $(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/*.h $CONTRIB/include &&+ $(STRIP) $CONTRIB/lib/libmp4v2.a+ }+} +else+{+ actions LibMp4v2+ {+ cd `dirname $(>)` && CONTRIB=`pwd` &&+ rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) && + cd mpeg4ip &&+ $(PATCH) -p1 < ../patch-mpeg4ip.patch && $(PATCH) -p0 < ../patch-mpeg4ip-no_compressor_name.patch && $(PATCH) -p1 < ../patch_mpeg4ip_cygwin.patch &&+ ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&+ $(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/*.h $CONTRIB/include &&+ $(STRIP) $CONTRIB/lib/libmp4v2.a+ }+}+ Wget $(SUBDIR)/mpeg4ip.tar.gz : $(SUBDIR)/version_mpeg4ip.txt ; LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/mpeg4ip.tar.gz ; @@ -246,10 +286,11 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) && cd libmkv &&- ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&+ ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libmkv.a }+ Wget $(SUBDIR)/libmkv.tar.gz : $(SUBDIR)/version_libmkv.txt ; LibMkv $(SUBDIR)/lib/libmkv.a : $(SUBDIR)/libmkv.tar.gz ; @@ -264,7 +305,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libmpeg2.a }@@ -282,7 +323,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) && cd libogg &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libogg.a }@@ -300,7 +341,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) && cd libsamplerate &&- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libsamplerate.a }@@ -318,7 +359,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libvorbis && (gzip -dc libvorbis.tar.gz | tar xf - ) && cd libvorbis &&- ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&+ ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install && $(STRIP) $CONTRIB/lib/libvorbis.a }@@ -359,7 +400,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && cd x264 && $(LIBX264_PATCH)- bash ./configure --prefix=$CONTRIB --enable-pthread &&+ bash ./configure --prefix=$CONTRIB --enable-pthread $(EXTRA_FLAGS2) && $(MAKE) libx264.a && cp libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a } Wget $(SUBDIR)/x264.tar.gz : $(SUBDIR)/version_x264.txt ;@@ -386,7 +427,7 @@ cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf xvidcore && (gzip -dc xvidcore.tar.gz | tar xf - ) && cd xvidcore && $(LIBXVIDCORE_PATCH)- cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) libxvidcore.a &&+ cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) libxvidcore.a && cp ./=build/libxvidcore.a $CONTRIB/lib/ && cp ../../src/xvid.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libxvidcore.a