comparison Makefile.gen @ 653:469119cab5b2

More cleanup work. Build is broken for now.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Apr 2013 06:18:02 +0300
parents 5df8ef3f88bb
children 064c942d342e
comparison
equal deleted inserted replaced
652:d9888292f971 653:469119cab5b2
28 endif 28 endif
29 endif 29 endif
30 30
31 EDITOR_PRO = editor.pro 31 EDITOR_PRO = editor.pro
32 EDITOR_MAKEFILE = Makefile.editor 32 EDITOR_MAKEFILE = Makefile.editor
33 EDITOR_SOURCES = edmain.cpp edgui.cpp edview.cpp edtlobj.cpp edtimeline.cpp edwaveform.cpp edres.cpp 33 EDITOR_SOURCES = editor/edmain.cpp editor/edgui.cpp editor/edview.cpp \
34 EDITOR_HEADERS = edmain.h edtlobj.h edview.h edtimeline.h edwaveform.h edres.h 34 editor/edtlobj.cpp editor/edtimeline.cpp editor/edwaveform.cpp \
35 editor/edres.cpp
36 EDITOR_HEADERS = editor/edmain.h editor/edtlobj.h editor/edview.h \
37 editor/edtimeline.h editor/edwaveform.h editor/edres.h
35 38
36 39
37 ### 40 ###
38 ### Form additional compilation defines based on settings 41 ### Form additional compilation defines based on settings
39 ### 42 ###
120 DMLIB_OBJS += dmtext_ttf.o 123 DMLIB_OBJS += dmtext_ttf.o
121 124
122 ifeq ($(DM_BUILD_TESTS),yes) 125 ifeq ($(DM_BUILD_TESTS),yes)
123 ifeq ($(DM_GFX_BLITS),yes) 126 ifeq ($(DM_GFX_BLITS),yes)
124 ifeq ($(DM_USE_STDIO),yes) 127 ifeq ($(DM_USE_STDIO),yes)
125 BINARIES += blittest vptest efu 128 TESTS_BINARIES += blittest vptest efu
126 endif 129 endif
127 endif 130 endif
128 endif 131 endif
129 endif 132 endif
130 133
210 ifeq ($(DM_BUILD_TOOLS),yes) 213 ifeq ($(DM_BUILD_TOOLS),yes)
211 DMLIB_OBJS += libgfx.o lib64gfx.o 214 DMLIB_OBJS += libgfx.o lib64gfx.o
212 ifeq ($(DM_USE_STDIO),yes) 215 ifeq ($(DM_USE_STDIO),yes)
213 TOOL_BINARIES+= objlink data2inc gfxconv gentab 216 TOOL_BINARIES+= objlink data2inc gfxconv gentab
214 ifeq ($(SUP_MODLOAD),yes) 217 ifeq ($(SUP_MODLOAD),yes)
215 TOOL_BINARIES+= viewmod mod2wav testpl 218 TOOL_BINARIES+= viewmod mod2wav
219 TESTS_BINARIES+= testpl
216 ifeq ($(DM_GFX_BLITS),yes) 220 ifeq ($(DM_GFX_BLITS),yes)
217 TOOL_BINARIES+= view64 221 TOOL_BINARIES+= view64
218 ifeq ($(DM_GFX_BM_TEXT),yes) 222 ifeq ($(DM_GFX_BM_TEXT),yes)
219 ifeq ($(DM_GFX_MISC),yes) 223 ifeq ($(DM_GFX_MISC),yes)
220 TOOL_BINARIES+= ppl 224 TOOL_BINARIES+= ppl
230 234
231 ifeq ($(DM_USE_LIBPNG),yes) 235 ifeq ($(DM_USE_LIBPNG),yes)
232 DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) 236 DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
233 endif 237 endif
234 238
239 ifeq ($(DM_BUILD_TESTS),yes)
240 TESTS_BINARIES += vecmattest fptest
241 endif
242
243 FONTCONV_BIN=$(BINPATH)fontconv$(EXEEXT)
244 DATA2INC_BIN=$(BINPATH)data2inc$(EXEEXT)
245
246
235 ### 247 ###
236 ### Rest of the rules 248 ### Rest of the rules
237 ### 249 ###
238 CFLAGS += -g -W -Wall -DHAVE_STRING_H $(EXTRA_CFLAGS) 250 CFLAGS += -g -W -Wall -DHAVE_STRING_H $(EXTRA_CFLAGS)
239 CXXFLAGS=$(CFLAGS) 251 CXXFLAGS=$(CFLAGS)
241 DM_CFLAGS += $(SDL_CFLAGS) 253 DM_CFLAGS += $(SDL_CFLAGS)
242 DM_LDFLAGS += $(LDFLAGS) 254 DM_LDFLAGS += $(LDFLAGS)
243 255
244 256
245 DMLIB_A=$(OBJPATH)dmlib.a 257 DMLIB_A=$(OBJPATH)dmlib.a
246 DMLIB_OBJS += dmfile.o dmbstr.o dmlib.o dmlerp.o dmstring.o \ 258 DMLIB_OBJS += \
259 dmfile.o dmbstr.o dmlib.o dmlerp.o dmstring.o \
247 dmargs.o dmvecmat.o dmperlin.o dmimage.o \ 260 dmargs.o dmvecmat.o dmperlin.o dmimage.o \
248 dmwav.o dmengine.o dmq3d.o 261 dmwav.o dmengine.o dmq3d.o
249 262
250 ifeq ($(DM_BUILD_TESTS),yes) 263
251 BINARIES += vecmattest fptest 264 TESTS_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES)))
252 endif
253
254 FONTCONV_BIN=$(BINPATH)fontconv$(EXEEXT)
255 DATA2INC_BIN=$(BINPATH)data2inc$(EXEEXT)
256
257 TOOL_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES))) 265 TOOL_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES)))
258 TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) $(TOOL_TARGETS) 266 TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \
267 $(TOOL_TARGETS) $(TESTS_TARGETS)
259 268
260 all: $(TARGETS) 269 all: $(TARGETS)
261 270
262 ### 271 ###
263 ### Generic rules 272 ### Generic rules
264 ### 273 ###
265 $(OBJPATH)gtk%.o: $(DMLIB)gtk%.c $(DMLIB)gtk%.h
266 @echo " CC $+"
267 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(GTK_CFLAGS)
268
269
270 $(OBJPATH)%.d: $(DMLIB)%.c 274 $(OBJPATH)%.d: $(DMLIB)%.c
271 @echo > $@ 275 @echo > $@
272 @grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done 276 @grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done
277
278
279 $(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h
280 @echo " CC $<"
281 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
282
283 $(OBJPATH)%.o: $(DMLIB)tests/%.c
284 @echo " CC $<"
285 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
286
287
288 $(OBJPATH)%.o: $(DMLIB)tools/%.c $(DMLIB)tools/%.h
289 @echo " CC $<"
290 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
291
292 $(OBJPATH)%.o: $(DMLIB)tools/%.c
293 @echo " CC $<"
294 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
295
273 296
274 297
275 $(OBJPATH)%.o: $(DMLIB)%.c $(DMLIB)%.h 298 $(OBJPATH)%.o: $(DMLIB)%.c $(DMLIB)%.h
276 @echo " CC $<" 299 @echo " CC $<"
277 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 300 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
373 396
374 $(BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A) 397 $(BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A)
375 @echo " LINK $+" 398 @echo " LINK $+"
376 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm 399 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm
377 400
401 $(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A)
402 @echo " LINK $+"
403 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
404
405
378 $(BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A) 406 $(BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
379 @echo " LINK $+" 407 @echo " LINK $+"
380 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) 408 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
381 409
382 $(BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A) 410 $(BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
399 427
400 $(BINPATH)ppl$(EXEEXT): $(DMLIB)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A) 428 $(BINPATH)ppl$(EXEEXT): $(DMLIB)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A)
401 @echo " LINK $+" 429 @echo " LINK $+"
402 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) 430 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
403 431
404
405 $(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A)
406 @echo " LINK $+"
407 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
408 432
409 $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A) 433 $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
410 @echo " LINK $+" 434 @echo " LINK $+"
411 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) 435 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
412 436