[SCM] mess system emulator branch, master, updated. 16324aa82d12bc4e8bdef290157e58d14cdc0feb

[Cesare Falco]

The following commit has been merged in the master branch:
commit 16324aa82d12bc4e8bdef290157e58d14cdc0feb
Author: Cesare Falco <cesare.falco at gmail.com>
Date:   Mon Aug 27 23:41:41 2012 +0200

    Fixed all settings of DEB_MESS_OPTS make variable.

diff --git a/debian/rules b/debian/rules
index 1ff1233..e03a71a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,11 +14,11 @@ CFLAGS = -Wall -g
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Override relevant make variables in original makefile
-DEB_MAME_OPTS = \
-    OPT_FLAGS="-D'INI_PATH=\"/etc/mame\"'" \
-    FULLNAME=mame \
-    TARGET=mame \
-    SUBTARGET=mame \
+DEB_MESS_OPTS = \
+    OPT_FLAGS="-D'INI_PATH=\"/etc/mess\"'" \
+    FULLNAME=mess \
+    TARGET=mess \
+    SUBTARGET=mess \
     OSD=sdl \
     CROSS_BUILD_OSD= \
     NOASM=1 \
@@ -26,7 +26,7 @@ DEB_MAME_OPTS = \
     SUFFIX= \
     DEBUG= \
     PROFILER= \
-    NOWERROR= \
+    NOWERROR=1 \
     MACOSX_USE_LIBSDL= \
     BUILD_EXPAT= \
     BUILD_ZLIB= \
@@ -40,21 +40,13 @@ DEB_MAME_OPTS = \
     VERBOSE= \
     OPTIMIZE=2 \
     LDFLAGS="-Wl,--as-needed" \
-    LDFLAGSEMULATOR="-Wl,--as-needed" \
-    NOWERROR=1 \
-
-DEB_MESS_OPTS = \
-    $(DEB_MAME_OPTS) \
-    OPT_FLAGS="-D'INI_PATH=\"/etc/mess\"'" \
-    FULLNAME=mess \
-    TARGET=mess \
-    SUBTARGET=mess
+    LDFLAGSEMULATOR="-Wl,--as-needed"
 
 # Override make variables for specific archs
 # Linux architectures
 ifeq ($(DEB_HOST_ARCH),amd64)
-DEB_MAME_OPTS += \
-    ARCHOPTS=-march=athlon64 \
+DEB_MESS_OPTS += \
+    ARCHOPTS=-mtune=generic \
     FORCE_DRC_C_BACKEND= \
     PTR64=1 \
     NOASM= \
@@ -62,8 +54,8 @@ DEB_MAME_OPTS += \
 endif
 
 ifeq ($(DEB_HOST_ARCH),i386)
-DEB_MAME_OPTS += \
-    ARCHOPTS=-march=pentium2 \
+DEB_MESS_OPTS += \
+    ARCHOPTS=-mtune=generic \
     FORCE_DRC_C_BACKEND= \
     PTR64= \
     NOASM= \
@@ -71,7 +63,7 @@ DEB_MAME_OPTS += \
 endif
 
 ifeq ($(DEB_HOST_ARCH),ia64)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     FORCE_DRC_C_BACKEND=1 \
     PTR64=1 \
     NOASM=1 \
@@ -79,20 +71,20 @@ DEB_MAME_OPTS += \
 endif
 
 ifeq ($(DEB_HOST_ARCH),mips)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     ARCHOPTS=-Umips \
     FORCE_DRC_C_BACKEND=1 \
     BIGENDIAN=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),mipsel)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     ARCHOPTS=-Umips \
     FORCE_DRC_C_BACKEND=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),powerpc)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     ARCHOPTS=-Upowerpc \
     FORCE_DRC_C_BACKEND=1 \
     NOASM= \
@@ -100,27 +92,27 @@ DEB_MAME_OPTS += \
 endif
 
 ifeq ($(DEB_HOST_ARCH),s390)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     FORCE_DRC_C_BACKEND=1 \
     BIGENDIAN=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),s390x)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     FORCE_DRC_C_BACKEND=1 \
     PTR64=1 \
     BIGENDIAN=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),sparc)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     FORCE_DRC_C_BACKEND=1 \
     BIGENDIAN=1
 endif
 
 # kFreeBSD architectures
 ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     TARGETOS=freebsd \
     PTR64=1 \
     FORCE_DRC_C_BACKEND= \
@@ -129,7 +121,7 @@ DEB_MAME_OPTS += \
 endif
 
 ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
-DEB_MAME_OPTS += \
+DEB_MESS_OPTS += \
     TARGETOS=freebsd \
     FORCE_DRC_C_BACKEND= \
     PTR64= \

-- 
mess system emulator