aef7d40637
with input from sthen@. previous updates tested by edd@.
53 lines
1.5 KiB
Plaintext
53 lines
1.5 KiB
Plaintext
$OpenBSD: patch-makefile,v 1.3 2011/11/27 12:42:28 fgsch Exp $
|
|
--- makefile.orig Sat Feb 12 15:17:48 2011
|
|
+++ makefile Thu Jun 2 12:18:06 2011
|
|
@@ -206,10 +206,10 @@ endif
|
|
# BIGENDIAN = 1
|
|
|
|
# uncomment next line to build expat as part of MAME build
|
|
-BUILD_EXPAT = 1
|
|
+# BUILD_EXPAT = 1
|
|
|
|
# uncomment next line to build zlib as part of MAME build
|
|
-BUILD_ZLIB = 1
|
|
+# BUILD_ZLIB = 1
|
|
|
|
# uncomment next line to include the symbols
|
|
# SYMBOLS = 1
|
|
@@ -298,7 +298,7 @@ endif
|
|
|
|
# compiler, linker and utilities
|
|
AR = @ar
|
|
-CC = @gcc
|
|
+CC ?= @gcc
|
|
LD = @g++
|
|
MD = -mkdir$(EXE)
|
|
RM = @rm -f
|
|
@@ -347,7 +347,7 @@ NAME = $(TARGET)$(SUBTARGET)
|
|
endif
|
|
|
|
# fullname is prefix+name+suffix+suffix64+suffixdebug
|
|
-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
|
|
+FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
|
|
|
|
# add an EXE suffix to get the final emulator name
|
|
EMULATOR = $(FULLNAME)$(EXE)
|
|
@@ -423,7 +423,7 @@ CPPONLYFLAGS =
|
|
|
|
# CFLAGS is defined based on C or C++ targets
|
|
# (remember, expansion only happens when used, so doing it here is ok)
|
|
-CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS)
|
|
+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS)
|
|
|
|
# we compile C-only to C89 standard with GNU extensions
|
|
# we compile C++ code to C++98 standard with GNU extensions
|
|
@@ -450,7 +450,7 @@ CCOMFLAGS += -pg
|
|
endif
|
|
|
|
# add the optimization flag
|
|
-CCOMFLAGS += -O$(OPTIMIZE)
|
|
+#CCOMFLAGS += -O$(OPTIMIZE)
|
|
|
|
# if we are optimizing, include optimization options
|
|
# and make all errors into warnings
|