More small speed tweaks to macroblock.c

[x264] / configure

diff --git a/configure b/configure
index c8bbd5187fb9c2ac49d49bf75bb87248de36bb69..eb5109192366d005d10114eec588b220695c8aa6 100755 (executable)
--- a/configure
+++ b/configure
@@ -11,7 +11,6 @@ echo "  --disable-avis-input     disables avisynth input (win32 only)"
 echo "  --disable-mp4-output     disables mp4 output (using gpac)"
 echo "  --disable-pthread        disables multithreaded encoding"
 echo "  --disable-asm            disables assembly optimizations on x86"
-echo "  --enable-gtk             build GTK+ interface"
 echo "  --enable-debug           adds -g, doesn't strip"
 echo "  --enable-gprof           adds -pg, doesn't strip"
 echo "  --enable-visualize       enables visualization (X11 only)"
@@ -58,7 +57,6 @@ asm="yes"
 debug="no"
 gprof="no"
 pic="no"
-gtk="no"
 vis="no"
 shared="no"
 
@@ -148,12 +146,6 @@ for opt do
         --enable-pic)
             pic="yes"
             ;;
-        --enable-gtk)
-            gtk="yes"
-            ;;
-        --disable-gtk)
-            gtk="no"
-            ;;
         --enable-shared)
             shared="yes"
             ;;
@@ -192,6 +184,9 @@ case $host_os in
     SYS="MACOSX"
     CFLAGS="$CFLAGS -falign-loops=16"
     LDFLAGS="$LDFLAGS -lm -lmx"
+    if [ "$pic" = "no" ]; then
+        CFLAGS="$CFLAGS -mdynamic-no-pic"
+    fi
     ;;
   freebsd*)
     SYS="FREEBSD"
@@ -251,7 +246,6 @@ case $host_cpu in
     else
       ASFLAGS="$ASFLAGS -f elf"
     fi
-    as_check || AS="nasm"
     ;;
   x86_64)
     ARCH="X86_64"
@@ -307,12 +301,12 @@ if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" \)
 fi
 
 if [ $asm = yes -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
-    if as_check "pabsw xmm0, xmm0" ; then
+    if as_check "pinsrd xmm0, [esp], 0" ; then
         CFLAGS="$CFLAGS -DHAVE_MMX"
     else
-        VER=`([ $AS == nasm ] && nasm -v || $AS --version || echo no assembler) 2>$DEVNULL | head -n 1`
+        VER=`($AS --version || echo no assembler) 2>$DEVNULL | head -n 1`
         echo "Found $VER"
-        echo "Minimum version is yasm-0.6.1 or nasm-2.0"
+        echo "Minimum version is yasm-0.6.1"
         echo "If you really want to compile without asm, configure with --disable-asm."
         exit 1
     fi
@@ -427,7 +421,6 @@ ALTIVECFLAGS=$ALTIVECFLAGS
 LDFLAGS=$LDFLAGS
 AS=$AS
 ASFLAGS=$ASFLAGS
-GTK=$gtk
 EXE=$EXE
 VIS=$vis
 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
@@ -441,8 +434,6 @@ for A in "$@" ; do
 done
 echo '' >> config.mak
 
-cp config.mak gtk/config.mak
-
 if [ "$shared" = "yes" ]; then
     API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
     if [ "$SYS" = "MINGW" ]; then
@@ -459,22 +450,6 @@ if [ "$shared" = "yes" ]; then
         echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
     fi
     echo 'default: $(SONAME)' >> config.mak
-    if [ "$gtk" = "yes" ]; then
-        if [ "$SYS" = "MACOSX" ]; then
-            echo "SOSUFFIX=dylib" >> gtk/config.mak
-            echo "SONAMEGTK=libx264gtk.$API.dylib" >> gtk/config.mak
-            echo 'SOFLAGS=-dynamiclib -Wl,-single_module -Wl,-read_only_relocs,suppress -install_name $(DESTDIR)$(libdir)/$(SONAMEGTK)' >> gtk/config.mak
-        else
-            echo "SOSUFFIX=so" >> gtk/config.mak
-            echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
-            echo 'SOFLAGS=-Wl,-soname,$(SONAMEGTK)' >> gtk/config.mak
-        fi
-    fi
-fi
-
-if [ "$gtk" = "yes" ]; then
-    echo 'default: libx264gtk.a' >> config.mak
-    echo 'install: install-gtk' >> config.mak
 fi
 
 ./version.sh
@@ -501,7 +476,6 @@ echo "asm:        $asm"
 echo "avis input: $avis_input"
 echo "mp4 output: $mp4_output"
 echo "pthread:    $pthread"
-echo "gtk:        $gtk"
 echo "debug:      $debug"
 echo "gprof:      $gprof"
 echo "PIC:        $pic"