Changeset 289

Timestamp:

01/16/07 21:45:01 (2 years ago)

Author:

astrange

Message:

Optimize PPC build for G5, as it's pickier.
Slight change for x86 as well, and remove ffmpeg patch as it seems to be obsolete.
This causes ffmpeg to print spurious gcc errors, but it doesn't seem to affect anything.

Files:

• trunk/createStaticLibs.sh (modified) (4 diffs)
• trunk/linkingFix.patch (deleted)

trunk/createStaticLibs.sh

@@ -3 +3 @@
-buildid_ffmpeg="r`svn info ffmpeg | grep -F Revision | awk '{print $2}'`"
-
-
-
-
-
-
+
-
-OUTPUT_FILE="$BUILT_PRODUCTS_DIR/Universal/buildid"
@@ -27 +23 @@
-        echo "Static ffmpeg libs are out-of-date ; rebuilding"
-        
-        echo "Patching ffmpeg's broken linking"
-        cd "$SRCROOT"
-        svn revert ffmpeg/libavcodec/h264.c
-        patch -p0 < linkingFix.patch
-        
-        mkdir "$BUILT_PRODUCTS_DIR"
-        #######################
@@ -39 +30 @@
-        mkdir "$BUILDDIR"
-        
+        #we override ffmpeg's optimization settings for slightly better ones
+        #this seems to cause spurious gcc errors...
+        export optCFlags="-O3 -march=nocona -mtune=nocona -fomit-frame-pointer -mdynamic-no-pic" 
+if [ "$BUILD_STYLE" = "Development" ] ; then
+        export optCFlags=""
+fi
+
-        cd "$BUILDDIR"
-        if [ `arch` != i386 ] ; then
-
+ $optCFlags
-        else
-a --extra-cflags='-gdwarf-2
+ --extra-cflags='-gdwarf-2 $optCFlags
-        fi
-        make -C libavutil   depend
@@ -65 +63 @@
-        mkdir "$BUILDDIR"
-        
+        export optCFlags="-fastf -mcpu=G3 -mmultiple"
+if [ "$BUILD_STYLE" = "Development" ] ; then
+        export optCFlags=""
+fi
-        cd "$BUILDDIR"
-        if [ `arch` = ppc ] ; then
-
+ $optCFlags
-        else
-
+ $optCFlags
-        fi
-        make -C libavutil   depend