1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
diff --git a/Makefile b/Makefile
index 50e420c..c0e877b 100644
--- a/Makefile
+++ b/Makefile
@@ -62,29 +62,32 @@ endif
else
INSTALLPATH=$(INSTALLPATH_MSYS_MINGW)
endif
-else
+else
INSTALLPATH=$(INSTALLPATH_LINUX)
endif
endif
# use 386 instructions but optimize for pentium II/III
-CFLAGS = -g -D$(TYPESIZE) -O3 -I. -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
+CFLAGS += -D$(TYPESIZE) -I. -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized
+CXXFLAGS += -D$(TYPESIZE) -I. -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized
ifeq ($(DEBUG),1)
CFLAGS += -DDEBUG
+CXXFLAGS += -DDEBUG
endif
ifeq ($(MACHINE),mingw32)
CFLAGS += -DMINGW
+CXXFLAGS += -DMINGW
endif
ifeq ($(ISCYGWIN),1)
ifeq ($(NOCYGWIN),1)
CFLAGS += -DMINGW -mno-cygwin
+CXXFLAGS += -DMINGW -mno-cygwin
endif
endif
-CXXFLAGS = $(CFLAGS)
# Somewhat automatic detection of the correct boost include folder
@@ -171,7 +174,7 @@ endif
PAL_FILES = pals/$(subst &,.bcp pals/,$(PALORDER)).bcp
# deafult targets
-all: $(GRFCODEC) $(GRFDIFF) $(GRFMERGE)
+all: version.h $(GRFCODEC) $(GRFDIFF) $(GRFMERGE)
remake: clean all
${MAKEFILELOCAL}:
@@ -181,15 +184,15 @@ ${MAKEFILELOCAL}:
$(GRFCODEC): $(GRFCODECSRC:%.c=%.o)
$(_E) [LD] $@
- $(_C)$(CXX) -o $@ $(CFLAGS) $^ $(LDOPT)
+ $(_C)$(CXX) -o $@ $(CXXFLAGS) $^ $(LDOPT)
$(GRFDIFF): $(GRFDIFFSRC:%.c=%.o) grfmrg.o
$(_E) [LD] $@
- $(_C)$(CXX) -o $@ $(CFLAGS) $^ $(LDOPT)
+ $(_C)$(CXX) -o $@ $(CXXFLAGS) $^ $(LDOPT)
$(GRFMERGE): $(GRFMERGESRC:%.c=%.o)
$(_E) [LD] $@
- $(_C)$(CXX) -o $@ $(CFLAGS) $^ $(LDOPT)
+ $(_C)$(CXX) -o $@ $(CXXFLAGS) $^ $(LDOPT)
clean:
@@ -219,9 +222,7 @@ FORCE:
$(_E) [REBUILD] $(@:%_r=%)
$(_C)rm -f $(@:%_r=%)
$(_C)$(MAKE) ${_S} $(@:%_r=%)
- $(_E) [STRIP/UPX] $(@:%_r=%)
$(_C)$(STRIP) $(@:%_r=%)
- $(_C)upx $(_Q) --best $(@:%_r=%)
release: $(GRFCODEC)_r $(GRFDIFF)_r $(GRFMERGE)_r
@@ -230,9 +231,7 @@ grfmrgc.bin: grfmerge.os $(GRFMERGESRC:%.c=%.os)
$(_C)rm -f $@
$(_E) [LD] $@
$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
- $(_E) [STRIP/UPX] $@
$(_C)$(STRIP) $@
- $(_C)upx $(_Q) --best $@
grfmrg.c: grfmrgc.bin grfmrgc.pl
$(_E) [PERL] $@
@@ -291,15 +290,18 @@ ttdpal.h: $(PAL_FILES) pal2c.pl
%.o.d:
$(_E) [CPP DEP] $@
- $(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG $*.c* -MF $@
+ $(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG error.c getopt.c grfcomm.c grfmerge.c path.c -MF $@
+ $(_C)$(CXX) $(CXXFLAGS) -DMAKEDEP -MM -MG file.cc grfcodec.cc grfdiff.cc info.cc pcxfile.cc pcxsprit.cc readinfo.cc sprites.cc -MF $@
%.os.d:
$(_E) [CPP DEP] $@
- $(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ $*.c*
+ $(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ error.c getopt.c grfcomm.c grfmerge.c path.c
+ $(_C)$(CXX) $(CXXFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ file.cc grfcodec.cc grfdiff.cc info.cc pcxfile.cc pcxsprit.cc readinfo.cc sprites.cc
-%.obj.d: $(wildcard %.c*)
+%.obj.d:
$(_E) [CPP DEP] $@
- $(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ $*.c*
+ $(_C)$(CC) $(CFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ error.c getopt.c grfcomm.c grfmerge.c path.c
+ $(_C)$(CXX) $(CXXFLAGS) -DMAKEDEP -MM -MG -MT ${subst .d,,$@} -MF $@ file.cc grfcodec.cc grfdiff.cc info.cc pcxfile.cc pcxsprit.cc readinfo.cc sprites.cc
ifndef NO_MAKEFILE_DEP
-include $(GRFCODECSRC:%.c=%.o.d)
diff --git a/Makefile.common b/Makefile.common
index c559c0a..fe99591 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -5,9 +5,7 @@ FORCE:
$(_E) [REBUILD] $(@:%_r=%)
$(_C)rm -f $(@:%_r=%)$(EXE)
$(_C)make -f $(MAKEFILE) $(_S) $(@:%_r=%)
- $(_E) [STRIP/UPX] $(@:%_r=%)
$(_C)strip $(@:%_r=%)$(REL_EXE)
- $(_C)upx $(_Q) --best $(@:%_r=%)$(REL_EXE)
release: grfcodec_r grfdiff_r grfmerge_r
@@ -16,9 +14,7 @@ grfmrgc.bin: grfmerge.os $(GRFMERGESRC:%.c=%.os)
$(_C)rm -f $@
$(_E) [LD] $@
$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
- $(_E) [STRIP/UPX] $@
$(_C)strip $@
- $(_C)upx $(_Q) --best $@
grfmrg.c: grfmrgc.bin grfmrgc.pl
$(_E) [PERL] $@
@@ -32,7 +28,7 @@ ttdpal.h: $(PAL_FILES) pal2c.pl
readinfo.o: readinfo.cc
$(_E) [CPP] $@
- $(BOOST_WARN)
+ $(BOOST_WARN)
$(_C)$(CXX) -c -o $@ -MMD -MG -MF $@.d $(CXXFLAGS) $<
%.o : %.c
|
GitWeb