[SCM] transportation simulator branch, master, updated. debian/110.0-1-3-g564f889

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit a0fb8e9a864a8e5f8c745cee26cd65296eee9374
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Fri Feb 18 17:50:46 2011 +0100

    Do not use compiler flags specific to i386 and amd64.
    
    Bug-Debian: http://bugs.debian.org/613962

diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 150d08f..79c5388 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -127,3 +127,32 @@ Build configuration for Debian
  #if defined _MSC_VER
  #	if _MSC_VER <= 1200
  #		error "Simutrans cannot be compiled with Visual C++ 6.0 or earlier."
+--- simutrans.orig/Makefile
++++ simutrans/Makefile
+@@ -78,16 +78,16 @@
+ SDL_CONFIG     ?= sdl-config
+ 
+ 
+-ifneq ($(OPTIMISE),)
+-    CFLAGS += -O3 -fno-schedule-insns
+-  ifneq ($(OSTYPE),mac)
+-    ifneq ($(OSTYPE),haiku)
+-      CFLAGS += -minline-all-stringops
+-    endif
+-  endif
+-else
+-  CFLAGS += -O
+-endif
++#ifneq ($(OPTIMISE),)
++#    CFLAGS += -O3 -fno-schedule-insns
++#  ifneq ($(OSTYPE),mac)
++#    ifneq ($(OSTYPE),haiku)
++#      CFLAGS += -minline-all-stringops
++#    endif
++#  endif
++#else
++#  CFLAGS += -O
++#endif
+ 
+ ifdef DEBUG
+   ifeq ($(shell expr $(DEBUG) \>= 1), 1)

-- 
transportation simulator