diff options
Diffstat (limited to 'emulators/mame/files/patch-makefile')
| -rw-r--r-- | emulators/mame/files/patch-makefile | 56 |
1 files changed, 10 insertions, 46 deletions
diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile index 9dc54e92d8a5..16ebca17f570 100644 --- a/emulators/mame/files/patch-makefile +++ b/emulators/mame/files/patch-makefile @@ -1,58 +1,22 @@ ---- makefile.orig 2009-11-13 11:07:31.000000000 +0100 -+++ makefile 2009-11-13 11:08:58.000000000 +0100 -@@ -59,7 +59,7 @@ - ifeq ($(OSD),windows) - TARGETOS = win32 - else --TARGETOS = unix -+TARGETOS = freebsd - endif - endif - -@@ -197,8 +197,8 @@ +--- makefile.orig 2010-03-01 20:26:50.000000000 +0100 ++++ makefile 2010-03-24 00:48:38.000000000 +0100 +@@ -266,8 +266,8 @@ # compiler, linker and utilities AR = @ar -CC = @gcc --LD = @gcc -+CC := @$(CC) -+LD := @$(CC) +-LD = @g++ ++CC:= @$(CC) ++LD:= @$(CXX) MD = -mkdir$(EXE) RM = @rm -f -@@ -227,7 +227,7 @@ +@@ -308,7 +308,7 @@ endif - # fullname is prefix+name+suffix+debugsuffix --FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX) -+FULLNAME = sdl$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX) + # fullname is prefix+name+suffix+suffix64+suffixdebug +-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG) ++FULLNAME = $(NAME) # add an EXE suffix to get the final emulator name EMULATOR = $(FULLNAME)$(EXE) -@@ -338,7 +338,7 @@ - ifneq ($(OPTIMIZE),0) - ifneq ($(TARGETOS),os2) - ifndef IA64 --CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) -+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) - else - endif - else -@@ -382,7 +382,7 @@ - -I$(SRC)/lib/util \ - -I$(SRC)/osd \ - -I$(SRC)/osd/$(OSD) \ -- -+ -I$(LOCALBASE)/include \ - - - #------------------------------------------------- -@@ -395,7 +395,7 @@ - ifneq ($(TARGETOS),macosx) - ifneq ($(TARGETOS),os2) - ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common -+LDFLAGS = -Wl,--warn-common $(PTHREAD_LIBS) -L$(LOCALBASE)/lib - endif - endif - endif |