diff options
author | Alejandro Pulver <alepulver@FreeBSD.org> | 2007-07-24 13:49:50 +0000 |
---|---|---|
committer | Alejandro Pulver <alepulver@FreeBSD.org> | 2007-07-24 13:49:50 +0000 |
commit | 948cf03107506179c028a51b3fa33de2728a6d24 (patch) | |
tree | 6588abe72e80db9d14b14c60e636d4a5b64e41fc /emulators/mame/files/patch-makefile | |
parent | 2f084025faef3937ab2d8cdd57d3fe80f04c2336 (diff) |
- Update to version 0.117.
Notes
Notes:
svn path=/head/; revision=196200
Diffstat (limited to 'emulators/mame/files/patch-makefile')
-rw-r--r-- | emulators/mame/files/patch-makefile | 149 |
1 files changed, 46 insertions, 103 deletions
diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile index d839b1ec02ca..beaf875a55c4 100644 --- a/emulators/mame/files/patch-makefile +++ b/emulators/mame/files/patch-makefile @@ -1,20 +1,19 @@ ---- makefile.orig Thu Apr 12 22:01:33 2007 -+++ makefile Sat Apr 21 13:20:41 2007 -@@ -63,11 +63,13 @@ - # uncomment next line to include the debugger - # DEBUG = 1 - -+ifeq ($(ARCH),i386) +--- makefile.orig Thu Jun 28 14:55:46 2007 ++++ makefile Fri Jul 20 14:47:57 2007 +@@ -70,10 +70,12 @@ + # DEBUG = 1 + # uncomment next line to use DRC MIPS3 engine ++ifeq ($(ARCH),i386) X86_MIPS3_DRC = 1 # uncomment next line to use DRC PowerPC engine X86_PPC_DRC = 1 +endif - #------------------------------------------------- - # specify build options; see each option below -@@ -174,8 +176,8 @@ + # uncomment next line to use DRC Voodoo rasterizers + # X86_VOODOO_DRC = 1 +@@ -157,8 +159,8 @@ # compiler, linker and utilities AR = @ar @@ -22,111 +21,55 @@ -LD = @gcc +CC := @$(CC) +LD = @$(CC) - MD = -mkdir + MD = -mkdir$(EXE) RM = @rm -f -@@ -191,53 +193,12 @@ +@@ -237,7 +239,7 @@ endif - # by default, don't compile for a specific target CPU --NAME = $(PREFIX)$(TARGET) --ARCH = -- --# architecture-specific builds get extra options --ifdef ATHLON --NAME = $(PREFIX)$(TARGET)at --ARCH = -march=athlon --endif -- --ifdef I686 --NAME = $(PREFIX)$(TARGET)pp --ARCH = -march=pentiumpro --endif -- --ifdef P4 --NAME = $(PREFIX)$(TARGET)p4 --ARCH = -march=pentium4 --endif -- --ifdef AMD64 --NAME = $(PREFIX)$(TARGET)64 --ARCH = -march=athlon64 --endif -- --ifdef PM --NAME = $(PREFIX)$(TARGET)pm --ARCH = -march=pentium3 -msse2 --endif -- --ifdef G4 --NAME = $(PREFIX)$(TARGET)g4 --ARCH = -mcpu=G4 --endif -- --ifdef G5 --NAME = $(PREFIX)$(TARGET)g5 --ARCH = -mcpu=G5 --endif -- --ifdef CELL --NAME = $(PREFIX)$(TARGET)cbe -+NAME = $(TARGET) - ARCH = --endif + # fullname is prefix+name+suffix +-FULLNAME = $(PREFIX)$(NAME)$(SUFFIX) ++FULLNAME = $(NAME)$(SUFFIX) - # debug builds just get the 'd' suffix and nothing more - ifdef DEBUG --NAME = $(PREFIX)$(TARGET)d -+NAME = $(TARGET)d - endif - - EMULATOR = $(NAME)$(EXE) -@@ -275,7 +236,7 @@ - # compile and linking flags + # add an EXE suffix to get the final emulator name + EMULATOR = $(FULLNAME)$(EXE) +@@ -302,7 +304,7 @@ #------------------------------------------------- --CFLAGS = \ -+CFLAGS += \ - $(OPT_FLAGS) \ - -std=gnu89 \ - -I$(SRC)/$(TARGET) \ -@@ -287,6 +248,7 @@ - -I$(SRC)/lib/util \ - -I$(SRC)/osd \ - -I$(SRC)/osd/$(MAMEOS) \ -+ -I$(LOCALBASE)/include -I$(X11BASE)/include + # we compile to C89 standard with GNU extensions +-CFLAGS = -std=gnu89 ++CFLAGS += -std=gnu89 - ifdef MESS - CFLAGS += \ -@@ -305,7 +267,7 @@ - endif # PPC - endif # SYMBOLS + # add -g if we need symbols + ifdef SYMBOLS +@@ -333,12 +335,11 @@ + # 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 --CFLAGS += $(ARCH) \ -+CFLAGS += \ - -Wall \ - -Wpointer-arith \ - -Wbad-function-cast \ -@@ -317,7 +279,7 @@ - -Wdeclaration-after-statement + # only -Werror if not PTR64 and not DEBUG + ifndef PTR64 + ifndef DEBUG +-CFLAGS += -Werror + endif # !DEBUG + endif # !PTR64 + endif # neq OPTIMIZE +@@ -358,6 +359,7 @@ + -I$(SRC)/lib/util \ + -I$(SRC)/osd \ + -I$(SRC)/osd/$(OSD) \ ++ -I$(LOCALBASE)/include - ifneq ($(OPTIMIZE),0) --CFLAGS += -DNDEBUG $(ARCH) -fno-strict-aliasing -+CFLAGS += -DNDEBUG -fno-strict-aliasing - endif - CFLAGS += -O$(OPTIMIZE) -@@ -325,11 +287,9 @@ - # extra options needed *only* for the osd files - CFLAGSOSDEPEND = $(CFLAGS) --LDFLAGS = -WO -+LDFLAGS += -WO -L$(LOCALBASE)/lib -L$(X11BASE)/lib +@@ -367,7 +369,7 @@ --ifdef SYMBOLS + # LDFLAGS are used generally; LDFLAGSEMULATOR are additional + # flags only used when linking the core emulator -LDFLAGS = --else -+ifndef SYMBOLS - LDFLAGS += -s - endif ++LDFLAGS += -L$(LOCALBASE)/lib + LDFLAGSEMULATOR = + # strip symbols and other metadata in non-symbols builds |