comparison Makefile.gen @ 986:a25b6da1c4a8

Begin process of making zlib optional for some things. These changes are for build process only, and lack any other implementation.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 27 Feb 2015 20:15:34 +0200
parents fecf3967abee
children 027083293a8e
comparison
equal deleted inserted replaced
985:2fac0a28ff51 986:a25b6da1c4a8
75 ### 75 ###
76 ### Filesystem 76 ### Filesystem
77 ### 77 ###
78 ifeq ($(DM_USE_PACKFS),yes) 78 ifeq ($(DM_USE_PACKFS),yes)
79 BUILD_RES=yes 79 BUILD_RES=yes
80 DM_CFLAGS += -DDM_USE_PACKFS $(ZLIB_CFLAGS) 80 DM_CFLAGS += -DDM_USE_PACKFS
81 DM_LDFLAGS += $(ZLIB_LDFLAGS)
82 DMLIB_OBJS += dmpack.o 81 DMLIB_OBJS += dmpack.o
83 ifeq ($(DM_BUILD_TOOLS),yes) 82 ifeq ($(DM_BUILD_TOOLS),yes)
84 TOOL_BINARIES += packed 83 TOOL_BINARIES += packed
85 endif 84 endif
86 endif 85 endif
249 248
250 endif 249 endif
251 endif 250 endif
252 251
253 252
254 253 ### libPNG handling
255 ifeq ($(DM_USE_LIBPNG),yes) 254 ifeq ($(DM_USE_LIBPNG),yes)
256 DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) 255 DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS)
257 endif 256 endif
258 257
258
259 ### Check requirements for zlib
260 ifeq ($(DM_USE_ZLIB),yes)
261 DM_CFLAGS += -DDM_USE_ZLIB $(ZLIB_CFLAGS)
262 DEMO_LDFLAGS += $(ZLIB_LDFLAGS)
263 else
264 DEMO_LDFLAGS +=
265 endif
266 DM_ZLIB_LDFLAGS = $(ZLIB_LDFLAGS)
267
268
269 ### What tests to build?
259 ifeq ($(DM_BUILD_TESTS),yes) 270 ifeq ($(DM_BUILD_TESTS),yes)
260 TESTS_BINARIES += vecmattest fptest evaltest 271 TESTS_BINARIES += vecmattest fptest evaltest
261 endif 272 endif
262 273
263 FONTCONV_BIN=fontconv 274 FONTCONV_BIN=fontconv
429 @echo " LINK $+" 440 @echo " LINK $+"
430 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm 441 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
431 442
432 $(TESTS_BINPATH)efu$(EXEEXT): $(OBJPATH)efu.o $(DMLIB_A) 443 $(TESTS_BINPATH)efu$(EXEEXT): $(OBJPATH)efu.o $(DMLIB_A)
433 @echo " LINK $+" 444 @echo " LINK $+"
445 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) $(DM_ZLIB_LDFLAGS) -lm
446
447 $(TESTS_BINPATH)vptest$(EXEEXT): $(OBJPATH)vptest.o $(DMLIB_A)
448 @echo " LINK $+"
434 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm 449 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
435 450
436 $(TESTS_BINPATH)vptest$(EXEEXT): $(OBJPATH)vptest.o $(DMLIB_A)
437 @echo " LINK $+"
438 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
439
440 $(TESTS_BINPATH)evaltest$(EXEEXT): $(OBJPATH)evaltest.o $(OBJPATH)dmeval.o $(OBJPATH)dmevalw.o $(DMLIB_A) 451 $(TESTS_BINPATH)evaltest$(EXEEXT): $(OBJPATH)evaltest.o $(OBJPATH)dmeval.o $(OBJPATH)dmevalw.o $(DMLIB_A)
441 @echo " LINK $+" 452 @echo " LINK $+"
442 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm 453 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm
443 454
444 $(TESTS_BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A) 455 $(TESTS_BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A)
445 @echo " LINK $+" 456 @echo " LINK $+"
446 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm 457 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm
447 458
448 $(TESTS_BINPATH)plrtest$(EXEEXT): $(OBJPATH)plrtest.o $(DMLIB_A) 459 $(TESTS_BINPATH)plrtest$(EXEEXT): $(OBJPATH)plrtest.o $(DMLIB_A)
449 @echo " LINK $+" 460 @echo " LINK $+"
450 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lm 461 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(DM_ZLIB_LDFLAGS) -lm
451 462
452 463
453 ### 464 ###
454 ### Tools 465 ### Tools
455 ### 466 ###
456 $(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A) 467 $(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
457 @echo " LINK $+" 468 @echo " LINK $+"
458 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm 469 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) $(DM_ZLIB_LDFLAGS) -lm
459 470
460 $(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A) 471 $(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
461 @echo " LINK $+" 472 @echo " LINK $+"
462 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) 473 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
463 474
464 $(TOOL_BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A) 475 $(TOOL_BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
465 @echo " LINK $+" 476 @echo " LINK $+"
477 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(DM_ZLIB_LDFLAGS)
478
479 $(TOOL_BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
480 @echo " LINK $+"
481 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(DM_ZLIB_LDFLAGS) -lm
482
483 $(TOOL_BINPATH)xm2jss$(EXEEXT): $(OBJPATH)xm2jss.o $(DMLIB_A)
484 @echo " LINK $+"
485 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(DM_ZLIB_LDFLAGS)
486
487 $(TOOL_BINPATH)dumpmod$(EXEEXT): $(OBJPATH)dumpmod.o $(DMLIB_A)
488 @echo " LINK $+"
489 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(DM_ZLIB_LDFLAGS)
490
491 $(TOOL_BINPATH)ppl$(EXEEXT): $(DMLIBSRC)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A)
492 @echo " LINK $+"
493 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(DM_ZLIB_LDFLAGS) $(SDL_LDFLAGS) -lm
494
495 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A)
496 @echo " LINK $+"
466 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) 497 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
467 498
468 $(TOOL_BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
469 @echo " LINK $+"
470 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm
471
472 $(TOOL_BINPATH)xm2jss$(EXEEXT): $(OBJPATH)xm2jss.o $(DMLIB_A)
473 @echo " LINK $+"
474 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
475
476 $(TOOL_BINPATH)dumpmod$(EXEEXT): $(OBJPATH)dumpmod.o $(DMLIB_A)
477 @echo " LINK $+"
478 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
479
480 $(TOOL_BINPATH)ppl$(EXEEXT): $(DMLIBSRC)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A)
481 @echo " LINK $+"
482 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lm
483
484 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A)
485 @echo " LINK $+"
486 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
487
488 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o $(DMLIB_A) 499 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o $(DMLIB_A)
489 @echo " LINK $+" 500 @echo " LINK $+"
490 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) 501 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(DM_ZLIB_LDFLAGS)
491 502
492 $(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(OBJPATH)lib64gfx.o $(DMLIB_A) 503 $(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(OBJPATH)lib64gfx.o $(DMLIB_A)
493 @echo " LINK $+" 504 @echo " LINK $+"
494 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) 505 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(DM_ZLIB_LDFLAGS) $(SDL_LDFLAGS)
495 506
496 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A) 507 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A)
497 @echo " LINK $+" 508 @echo " LINK $+"
498 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm 509 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm
499 510
506 ### Demo binary 517 ### Demo binary
507 ### 518 ###
508 ifneq ($(DEMO_BIN),) 519 ifneq ($(DEMO_BIN),)
509 $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A) 520 $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
510 @echo " LINK $+" 521 @echo " LINK $+"
511 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lm 522 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(DEMO_LDFLAGS) -lm
512 endif 523 endif
513 524
514 525
515 ### 526 ###
516 ### Editor targets 527 ### Editor targets
519 @echo " CREATE $@" 530 @echo " CREATE $@"
520 @echo "OBJECTS_DIR = $(OBJPATH)" > $@ 531 @echo "OBJECTS_DIR = $(OBJPATH)" > $@
521 @echo "MOC_DIR = $(OBJPATH)" >> $@ 532 @echo "MOC_DIR = $(OBJPATH)" >> $@
522 @echo "QMAKE_CXXFLAGS += $(DM_CFLAGS) $(SDL_CFLAGS)" >> $@ 533 @echo "QMAKE_CXXFLAGS += $(DM_CFLAGS) $(SDL_CFLAGS)" >> $@
523 @echo "QMAKE_LIBS += $(filter-out %dmsimple.o,$(filter %.o %.a,$+))" >> $@ 534 @echo "QMAKE_LIBS += $(filter-out %dmsimple.o,$(filter %.o %.a,$+))" >> $@
524 @echo "QMAKE_LIBS += $(DM_LDFLAGS) $(SDL_LDFLAGS)" >> $@ 535 @echo "QMAKE_LIBS += $(DM_LDFLAGS) $(SDL_LDFLAGS) $(DEMO_LDFLAGS)" >> $@
525 @echo "MAKEFILE = $(EDITOR_MAKEFILE)" >> $@ 536 @echo "MAKEFILE = $(EDITOR_MAKEFILE)" >> $@
526 @echo "CONFIG += debug" >> $@ 537 @echo "CONFIG += debug" >> $@
527 @echo "QT += core gui opengl" >> $@ 538 @echo "QT += core gui opengl" >> $@
528 @echo "TARGET = $(BINPATH)ed_$(DEMO_BIN)$(EXEEXT)" >> $@ 539 @echo "TARGET = $(BINPATH)ed_$(DEMO_BIN)$(EXEEXT)" >> $@
529 @echo "TEMPLATE = app" >> $@ 540 @echo "TEMPLATE = app" >> $@