Changeset 19

Show
Ignore:
Timestamp:
07/10/06 18:18:14 (2 years ago)
Author:
gbooker
Message:

Temp fix to no longer need the configure patch until the "better solution" comes along.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/createStaticLibs.sh

    r18 r19  
    2727         
    2828        cd "$SRCROOT/ffmpeg" 
    29         patch -p0 < ../ffmpeg-configure-crosscomp.patch 
     29        #patch -p0 < ../ffmpeg-configure-crosscomp.patch 
    3030        patch -p0 < ../ffmpeg-svn-mactel.patch 
    3131         
    3232        cd "$BUILDDIR" 
    3333        if [ `arch` != i386 ] ; then 
    34                 "$SRCROOT/ffmpeg/configure" --cross-compile --cpu=x86 --enable-pp --enable-gpl --extra-cflags='-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk' --extra-ldflags='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386
     34                "$SRCROOT/ffmpeg/configure" --cross-compile --cpu=x86 --enable-pp --enable-gpl --cc='gcc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
    3535        else 
    3636                "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl --enable-memalign-hack 
     
    3939         
    4040        cd "$SRCROOT/ffmpeg" 
    41         patch -R -p0 < ../ffmpeg-configure-crosscomp.patch 
     41        #patch -R -p0 < ../ffmpeg-configure-crosscomp.patch 
    4242        patch -R -p0 < ../ffmpeg-svn-mactel.patch 
    4343         
     
    5050         
    5151        cd "$SRCROOT/ffmpeg" 
    52         patch -p0 < ../ffmpeg-configure-crosscomp.patch 
     52        #patch -p0 < ../ffmpeg-configure-crosscomp.patch 
    5353         
    5454        cd "$BUILDDIR" 
     
    5656                "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl 
    5757        else 
    58                 "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl --cpu=ppc  --extra-cflags='-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk' --extra-ldflags='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc
     58                "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl --cpu=ppc  --cc='gcc -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk
    5959        fi 
    6060        make -j3 
    6161         
    6262        cd "$SRCROOT/ffmpeg" 
    63         patch -R -p0 < ../ffmpeg-configure-crosscomp.patch 
     63        #patch -R -p0 < ../ffmpeg-configure-crosscomp.patch 
    6464         
    6565