- rel 0.2 for fixed desktop file

[packages/dosemu.git] / dosemu-make-new.patch

diff -urN dosemu-1.1.5.org/configure.ac dosemu-1.1.5/configure.ac
--- dosemu-1.1.5.org/configure.ac	2003-09-01 23:10:03.000000000 +0200
+++ dosemu-1.1.5/configure.ac	2003-09-01 23:10:53.000000000 +0200
@@ -428,9 +428,9 @@
   if test "$enable_debug" = "yes"; then
     CFLAGS="$CFLAGS -g"
     AC_DEFINE(_DEBUG)
-    OPT="-O"
+    OPT="$OPTFLAGS"
   else
-    OPT="-O2" # BIG NOTE: do _not_ use -O3,
+    OPT="$OPTFLAGS" # BIG NOTE: do _not_ use -O3,
               # because in forces _inline_ at places where we don't want it !
               # If we want _inline_, well then we 'code' it.
     OPT="$OPT -fomit-frame-pointer"  # never omit the frame pointer when debugging!
@@ -517,35 +517,6 @@
  fi
 
 
-  # -m486 is usually in the specs for the compiler
-  # but gcc-3.0 wants -mcpu=i486 instead
-  # and gcc-3.4 wants -mtune=i486 instead
-  # let the compiler options be dependent of the _target_
-  # where dosemu is compiled for, not the host
-  if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ;  then
-    target_cpu="i686"
-  fi
-  if test "$GCC_VERSION_CODE" -ge 3004 ; then
-     OPT="$OPT -mtune=$target_cpu"
-  elif test "$GCC_VERSION_CODE" -ge 2095 ; then
-     OPT="$OPT -mcpu=$target_cpu"
-  else
-     case "$target_cpu" in
-       i486)
-         OPT="$OPT -m486"
-         ;;
-       i386)
-         OPT="$OPT -m386"
-         ;;
-       *)
-         ;;
-     esac
-  fi
-  if test "$target_cpu" = "athlon"; then
-     OPT="$OPT -malign-functions=4 -fexpensive-optimizations"
-  elif test "$target_cpu" = "i486"; then
-     OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2"
-  fi
 
   AC_MSG_CHECKING(for glibc...)
   set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|gcc -E -|awk '/XXAaZZ/ {print $2 " " $4}'`
diff -urN dosemu-1.1.5.org/src/arch/linux/dosext/sound/midid/Makefile dosemu-1.1.5/src/arch/linux/dosext/sound/midid/Makefile
--- dosemu-1.1.5.org/src/arch/linux/dosext/sound/midid/Makefile	2003-09-01 23:10:03.000000000 +0200
+++ dosemu-1.1.5/src/arch/linux/dosext/sound/midid/Makefile	2003-09-01 23:10:19.000000000 +0200
@@ -19,7 +19,7 @@
 # No servicable parts below
 
 CC=gcc
-CFLAGS=-Wall -pipe -O -g
+CFLAGS=-Wall -pipe $(OPTFLAGS)
 LDFLAGS += -Wall
 OBJECTS=midid.o events.o io.o stats.o emulation.o device.o \
 oss.o midout.o timid.o null.o