|
Lines 1-5
Link Here
|
| 1 |
--- makefile.orig 2009-03-19 14:14:18.000000000 +0100 |
1 |
--- makefile.orig 2009-06-11 06:38:13.000000000 +0200 |
| 2 |
+++ makefile 2009-03-25 05:24:41.000000000 +0100 |
2 |
+++ makefile 2009-08-28 05:23:39.000000000 +0200 |
| 3 |
@@ -59,7 +59,7 @@ |
3 |
@@ -59,7 +59,7 @@ |
| 4 |
ifeq ($(OSD),windows) |
4 |
ifeq ($(OSD),windows) |
| 5 |
TARGETOS = win32 |
5 |
TARGETOS = win32 |
|
Lines 25-31
Link Here
|
| 25 |
-CC = @gcc |
25 |
-CC = @gcc |
| 26 |
-LD = @gcc |
26 |
-LD = @gcc |
| 27 |
+CC := @$(CC) |
27 |
+CC := @$(CC) |
| 28 |
+LD = @$(CC) |
28 |
+LD := @$(CC) |
| 29 |
MD = -mkdir$(EXE) |
29 |
MD = -mkdir$(EXE) |
| 30 |
RM = @rm -f |
30 |
RM = @rm -f |
| 31 |
|
31 |
|
|
Lines 38-62
Link Here
|
| 38 |
|
38 |
|
| 39 |
# add an EXE suffix to get the final emulator name |
39 |
# add an EXE suffix to get the final emulator name |
| 40 |
EMULATOR = $(FULLNAME)$(EXE) |
40 |
EMULATOR = $(FULLNAME)$(EXE) |
| 41 |
@@ -337,7 +337,7 @@ |
41 |
@@ -338,7 +338,7 @@ |
| 42 |
# and make all errors into warnings |
|
|
| 43 |
ifneq ($(OPTIMIZE),0) |
42 |
ifneq ($(OPTIMIZE),0) |
| 44 |
ifneq ($(TARGETOS),os2) |
43 |
ifneq ($(TARGETOS),os2) |
|
|
44 |
ifndef IA64 |
| 45 |
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) |
45 |
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) |
| 46 |
+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) |
46 |
+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) |
| 47 |
else |
47 |
else |
| 48 |
CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) |
|
|
| 49 |
endif |
48 |
endif |
| 50 |
@@ -379,7 +379,7 @@ |
49 |
else |
|
|
50 |
@@ -382,6 +382,7 @@ |
| 51 |
-I$(SRC)/lib/util \ |
51 |
-I$(SRC)/lib/util \ |
| 52 |
-I$(SRC)/osd \ |
52 |
-I$(SRC)/osd \ |
| 53 |
-I$(SRC)/osd/$(OSD) \ |
53 |
-I$(SRC)/osd/$(OSD) \ |
| 54 |
- |
|
|
| 55 |
+ -I$(LOCALBASE)/include |
54 |
+ -I$(LOCALBASE)/include |
| 56 |
|
55 |
|
| 57 |
|
56 |
|
| 58 |
#------------------------------------------------- |
57 |
|
| 59 |
@@ -392,7 +392,7 @@ |
58 |
@@ -395,7 +396,7 @@ |
| 60 |
ifneq ($(TARGETOS),macosx) |
59 |
ifneq ($(TARGETOS),macosx) |
| 61 |
ifneq ($(TARGETOS),os2) |
60 |
ifneq ($(TARGETOS),os2) |
| 62 |
ifneq ($(TARGETOS),solaris) |
61 |
ifneq ($(TARGETOS),solaris) |