- ugh, fixed

[packages/crossmingw32-allegro.git] / allegro-opt.patch

diff --git a/allegro-opt.patch b/allegro-opt.patch
index 04768d22bd75163165738b9048076a48ecc2ff71..16a6e65c967ff06b9905054b6abe9c0f58c09db9 100644 (file)
--- a/allegro-opt.patch
+++ b/allegro-opt.patch
@@ -1,12 +1,6 @@
-diff -ruN allegro-4.1.11./configure.in allegro-4.1.11/configure.in
---- allegro-4.1.11./configure.in       2003-06-30 01:27:00.000000000 +0200
-+++ allegro-4.1.11/configure.in        2003-08-25 00:23:10.000000000 +0200
-@@ -613,43 +613,20 @@
- AC_CHECK_FUNCS(memcmp mkstemp stricmp strlwr strupr)
- 
- dnl Tweak header files for library build
--CFLAGS="$CFLAGS -DALLEGRO_LIB_BUILD"
-+CFLAGS="$TARGET_ARCH -DALLEGRO_LIB_BUILD"
+--- allegro-4.1.12/configure.in.orig   2003-11-11 21:59:10.385928944 +0100
++++ allegro-4.1.12/configure.in        2003-11-11 22:02:54.074923048 +0100
+@@ -649,37 +649,13 @@
  
  dnl How to compile C and asm files.
  if test -n "GCC"; then
@@ -15,7 +9,7 @@ diff -ruN allegro-4.1.11./configure.in allegro-4.1.11/configure.in
 -  else
 -    WFLAGS="-Wall -Wno-unused"
 -  fi
--  if test "$allegro_cv_support_asm" = i386; then
+-  if test "X$allegro_cv_processor_type" = "Xi386"; then
 -    if test "$allegro_exclusive_optimizations" != none; then
 -      TARGET_ARCH="-march=$allegro_exclusive_optimizations"
 -    else
@@ -27,18 +21,12 @@ diff -ruN allegro-4.1.11./configure.in allegro-4.1.11/configure.in
 -  if test "X$allegro_cv_can_use_pipe" = "Xyes"; then
 -    CFLAGS="$CFLAGS -pipe"
 -  fi
-+  WFLAGS="-Wall -Wno-unused"
-+
-   if test "$allegro_cv_support_asm" != i386; then
-     CFLAGS="$CFLAGS -DALLEGRO_USE_C"
-   fi
 -  dnl Allow to specify additional flags.
 -  CFLAGS="$CFLAGS $XCFLAGS"
 -  WFLAGS="$WFLAGS $WCFLAGS"
 -  dnl In this order...
--  ALLEGRO_DEBUG_CFLAGS="$CFLAGS -g $WFLAGS -DDEBUGMODE"
-+
-+  ALLEGRO_DEBUG_CFLAGS="-g $WFLAGS -DDEBUGMODE"
++  WFLAGS="-Wall -Wno-unused"
+   ALLEGRO_DEBUG_CFLAGS="$CFLAGS -g $WFLAGS -DDEBUGMODE"
    if test "X$allegro_debug_with_fortify" = "Xyes"; then
       ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DFORTIFY"
    fi
@@ -48,6 +36,7 @@ diff -ruN allegro-4.1.11./configure.in allegro-4.1.11/configure.in
 -  else
 -    CFLAGS="$CFLAGS $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS"
 -  fi
++  CFLAGS="$CFLAGS $TARGET_ARCH"
 +  ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $WFLAGS"
    ALLEGRO_SFLAGS="-x assembler-with-cpp"
    ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED"