Lines 1-5
Link Here
|
1 |
--- makefile.orig 2009-03-05 14:16:35.000000000 +0000 |
1 |
--- makefile.orig 2009-06-11 06:38:13.000000000 +0200 |
2 |
+++ makefile 2009-03-13 02:39:13.000000000 +0000 |
2 |
+++ makefile 2009-07-23 02:44:01.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 16-22
Link Here
|
16 |
-CC = @gcc |
16 |
-CC = @gcc |
17 |
-LD = @gcc |
17 |
-LD = @gcc |
18 |
+CC := @$(CC) |
18 |
+CC := @$(CC) |
19 |
+LD = @$(CC) |
19 |
+LD := @$(CC) |
20 |
MD = -mkdir$(EXE) |
20 |
MD = -mkdir$(EXE) |
21 |
RM = @rm -f |
21 |
RM = @rm -f |
22 |
|
22 |
|
Lines 29-53
Link Here
|
29 |
|
29 |
|
30 |
# add an EXE suffix to get the final emulator name |
30 |
# add an EXE suffix to get the final emulator name |
31 |
EMULATOR = $(FULLNAME)$(EXE) |
31 |
EMULATOR = $(FULLNAME)$(EXE) |
32 |
@@ -337,7 +337,7 @@ |
32 |
@@ -338,7 +338,7 @@ |
33 |
# and make all errors into warnings |
|
|
34 |
ifneq ($(OPTIMIZE),0) |
33 |
ifneq ($(OPTIMIZE),0) |
35 |
ifneq ($(TARGETOS),os2) |
34 |
ifneq ($(TARGETOS),os2) |
|
|
35 |
ifndef IA64 |
36 |
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) |
36 |
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) |
37 |
+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) |
37 |
+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) |
38 |
else |
38 |
else |
39 |
CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) |
|
|
40 |
endif |
39 |
endif |
41 |
@@ -379,7 +379,7 @@ |
40 |
else |
|
|
41 |
@@ -382,6 +382,7 @@ |
42 |
-I$(SRC)/lib/util \ |
42 |
-I$(SRC)/lib/util \ |
43 |
-I$(SRC)/osd \ |
43 |
-I$(SRC)/osd \ |
44 |
-I$(SRC)/osd/$(OSD) \ |
44 |
-I$(SRC)/osd/$(OSD) \ |
45 |
- |
|
|
46 |
+ -I$(LOCALBASE)/include |
45 |
+ -I$(LOCALBASE)/include |
47 |
|
46 |
|
48 |
|
47 |
|
49 |
#------------------------------------------------- |
48 |
|
50 |
@@ -392,7 +392,7 @@ |
49 |
@@ -395,7 +396,7 @@ |
51 |
ifneq ($(TARGETOS),macosx) |
50 |
ifneq ($(TARGETOS),macosx) |
52 |
ifneq ($(TARGETOS),os2) |
51 |
ifneq ($(TARGETOS),os2) |
53 |
ifneq ($(TARGETOS),solaris) |
52 |
ifneq ($(TARGETOS),solaris) |