diff options
author | Alejandro Pulver <alepulver@FreeBSD.org> | 2007-09-05 22:38:15 +0000 |
---|---|---|
committer | Alejandro Pulver <alepulver@FreeBSD.org> | 2007-09-05 22:38:15 +0000 |
commit | d6ebd6c6f8b30f4465b2a5e699261668d63f9000 (patch) | |
tree | acc1c2ce65aeb1b69e15c7799854d050ba377118 /emulators/mame/files/patch-makefile | |
parent | - Update to version 0.118. (diff) |
- Update to version 0.118u3.
- The wrapper script additional output has been removed so programs that parse
the output do not get unexpected data.
Submitted by: nikow <madleser@gmx.de> (private e-mail)
Diffstat (limited to 'emulators/mame/files/patch-makefile')
-rw-r--r-- | emulators/mame/files/patch-makefile | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile index beaf875a55c4..92e19a29f2f9 100644 --- a/emulators/mame/files/patch-makefile +++ b/emulators/mame/files/patch-makefile @@ -1,10 +1,11 @@ ---- makefile.orig Thu Jun 28 14:55:46 2007 -+++ makefile Fri Jul 20 14:47:57 2007 -@@ -70,10 +70,12 @@ +--- makefile.orig Thu Aug 30 23:22:34 2007 ++++ makefile Fri Aug 31 11:13:31 2007 +@@ -69,11 +69,13 @@ + # uncomment next line to include the debugger # DEBUG = 1 - # uncomment next line to use DRC MIPS3 engine +ifeq ($(ARCH),i386) + # uncomment next line to use DRC MIPS3 engine X86_MIPS3_DRC = 1 # uncomment next line to use DRC PowerPC engine @@ -13,7 +14,18 @@ # uncomment next line to use DRC Voodoo rasterizers # X86_VOODOO_DRC = 1 -@@ -157,8 +159,8 @@ +@@ -96,7 +98,9 @@ + # CELL = 1 + + # uncomment next line if you are building for a 64-bit target +-# PTR64 = 1 ++ifeq ($(ARCH),amd64) ++PTR64 = 1 ++endif + + # uncomment next line to build expat as part of MAME build + BUILD_EXPAT = 1 +@@ -160,8 +164,8 @@ # compiler, linker and utilities AR = @ar @@ -24,16 +36,16 @@ MD = -mkdir$(EXE) RM = @rm -f -@@ -237,7 +239,7 @@ +@@ -240,7 +244,7 @@ endif # fullname is prefix+name+suffix -FULLNAME = $(PREFIX)$(NAME)$(SUFFIX) -+FULLNAME = $(NAME)$(SUFFIX) ++FULLNAME = $(NAME) # add an EXE suffix to get the final emulator name EMULATOR = $(FULLNAME)$(EXE) -@@ -302,7 +304,7 @@ +@@ -305,7 +309,7 @@ #------------------------------------------------- # we compile to C89 standard with GNU extensions @@ -42,21 +54,22 @@ # add -g if we need symbols ifdef SYMBOLS -@@ -333,12 +335,11 @@ +@@ -340,12 +344,12 @@ + # if we are optimizing, include optimization options # and make all errors into warnings - # but not on 64-bit or debug builds ifneq ($(OPTIMIZE),0) -CFLAGS += $(ARCH) -fno-strict-aliasing +CFLAGS += -fno-strict-aliasing # only -Werror if not PTR64 and not DEBUG - ifndef PTR64 ifndef DEBUG --CFLAGS += -Werror + ifndef PTR64 +-CFLAGS += -Werror $(ARCH) -fno-strict-aliasing ++#CFLAGS += -Werror $(ARCH) -fno-strict-aliasing endif # !DEBUG endif # !PTR64 endif # neq OPTIMIZE -@@ -358,6 +359,7 @@ +@@ -366,6 +370,7 @@ -I$(SRC)/lib/util \ -I$(SRC)/osd \ -I$(SRC)/osd/$(OSD) \ @@ -64,7 +77,7 @@ -@@ -367,7 +369,7 @@ +@@ -375,7 +380,7 @@ # LDFLAGS are used generally; LDFLAGSEMULATOR are additional # flags only used when linking the core emulator @@ -72,4 +85,4 @@ +LDFLAGS += -L$(LOCALBASE)/lib LDFLAGSEMULATOR = - # strip symbols and other metadata in non-symbols builds + # add profiling information for the linker |