|
Lines 1-8
Link Here
|
| 1 |
--- makefile.orig Fri Sep 14 17:11:34 2007 |
1 |
--- makefile.orig Sat Oct 20 16:33:18 2007 |
| 2 |
+++ makefile Mon Sep 17 19:59:44 2007 |
2 |
+++ makefile Wed Nov 7 18:22:11 2007 |
| 3 |
@@ -69,11 +69,13 @@ |
3 |
@@ -72,11 +72,13 @@ |
| 4 |
# uncomment next line to include the debugger |
4 |
# uncomment next line to include the internal profiler |
| 5 |
# DEBUG = 1 |
5 |
# PROFILER = 1 |
| 6 |
|
6 |
|
| 7 |
+ifeq ($(ARCH),i386) |
7 |
+ifeq ($(ARCH),i386) |
| 8 |
# uncomment next line to use DRC MIPS3 engine |
8 |
# uncomment next line to use DRC MIPS3 engine |
|
Lines 14-20
Link Here
|
| 14 |
|
14 |
|
| 15 |
# uncomment next line to use DRC Voodoo rasterizers |
15 |
# uncomment next line to use DRC Voodoo rasterizers |
| 16 |
# X86_VOODOO_DRC = 1 |
16 |
# X86_VOODOO_DRC = 1 |
| 17 |
@@ -96,7 +98,9 @@ |
17 |
@@ -99,7 +101,9 @@ |
| 18 |
# CELL = 1 |
18 |
# CELL = 1 |
| 19 |
|
19 |
|
| 20 |
# uncomment next line if you are building for a 64-bit target |
20 |
# uncomment next line if you are building for a 64-bit target |
|
Lines 25-31
Link Here
|
| 25 |
|
25 |
|
| 26 |
# uncomment next line to build expat as part of MAME build |
26 |
# uncomment next line to build expat as part of MAME build |
| 27 |
BUILD_EXPAT = 1 |
27 |
BUILD_EXPAT = 1 |
| 28 |
@@ -160,8 +164,8 @@ |
28 |
@@ -168,8 +172,8 @@ |
| 29 |
|
29 |
|
| 30 |
# compiler, linker and utilities |
30 |
# compiler, linker and utilities |
| 31 |
AR = @ar |
31 |
AR = @ar |
|
Lines 36-42
Link Here
|
| 36 |
MD = -mkdir$(EXE) |
36 |
MD = -mkdir$(EXE) |
| 37 |
RM = @rm -f |
37 |
RM = @rm -f |
| 38 |
|
38 |
|
| 39 |
@@ -240,7 +244,7 @@ |
39 |
@@ -248,7 +252,7 @@ |
| 40 |
endif |
40 |
endif |
| 41 |
|
41 |
|
| 42 |
# fullname is prefix+name+suffix |
42 |
# fullname is prefix+name+suffix |
|
Lines 45-51
Link Here
|
| 45 |
|
45 |
|
| 46 |
# add an EXE suffix to get the final emulator name |
46 |
# add an EXE suffix to get the final emulator name |
| 47 |
EMULATOR = $(FULLNAME)$(EXE) |
47 |
EMULATOR = $(FULLNAME)$(EXE) |
| 48 |
@@ -305,7 +309,7 @@ |
48 |
@@ -318,7 +322,7 @@ |
| 49 |
#------------------------------------------------- |
49 |
#------------------------------------------------- |
| 50 |
|
50 |
|
| 51 |
# we compile to C89 standard with GNU extensions |
51 |
# we compile to C89 standard with GNU extensions |
|
Lines 54-60
Link Here
|
| 54 |
|
54 |
|
| 55 |
# add -g if we need symbols |
55 |
# add -g if we need symbols |
| 56 |
ifdef SYMBOLS |
56 |
ifdef SYMBOLS |
| 57 |
@@ -340,12 +344,12 @@ |
57 |
@@ -352,11 +356,11 @@ |
| 58 |
# if we are optimizing, include optimization options |
58 |
# if we are optimizing, include optimization options |
| 59 |
# and make all errors into warnings |
59 |
# and make all errors into warnings |
| 60 |
ifneq ($(OPTIMIZE),0) |
60 |
ifneq ($(OPTIMIZE),0) |
|
Lines 63-75
Link Here
|
| 63 |
|
63 |
|
| 64 |
# only -Werror if not PTR64 and not DEBUG |
64 |
# only -Werror if not PTR64 and not DEBUG |
| 65 |
ifndef DEBUG |
65 |
ifndef DEBUG |
| 66 |
ifndef PTR64 |
66 |
-CFLAGS += $(ARCH) -fno-strict-aliasing |
| 67 |
-CFLAGS += -Werror $(ARCH) -fno-strict-aliasing |
67 |
+CFLAGS += -fno-strict-aliasing |
| 68 |
+#CFLAGS += -Werror -fno-strict-aliasing |
|
|
| 69 |
endif # PTR64 |
| 70 |
endif # !DEBUG |
68 |
endif # !DEBUG |
| 71 |
endif # neq OPTIMIZE |
69 |
endif # neq OPTIMIZE |
| 72 |
@@ -366,6 +370,7 @@ |
70 |
|
|
|
71 |
@@ -376,6 +380,7 @@ |
| 73 |
-I$(SRC)/lib/util \ |
72 |
-I$(SRC)/lib/util \ |
| 74 |
-I$(SRC)/osd \ |
73 |
-I$(SRC)/osd \ |
| 75 |
-I$(SRC)/osd/$(OSD) \ |
74 |
-I$(SRC)/osd/$(OSD) \ |
|
Lines 77-83
Link Here
|
| 77 |
|
76 |
|
| 78 |
|
77 |
|
| 79 |
|
78 |
|
| 80 |
@@ -375,7 +380,7 @@ |
79 |
@@ -385,7 +390,7 @@ |
| 81 |
|
80 |
|
| 82 |
# LDFLAGS are used generally; LDFLAGSEMULATOR are additional |
81 |
# LDFLAGS are used generally; LDFLAGSEMULATOR are additional |
| 83 |
# flags only used when linking the core emulator |
82 |
# flags only used when linking the core emulator |