comparison Makefile.gen @ 1436:8e1d86836efb

Fix build.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 12 Dec 2017 02:01:02 +0200
parents a9516570cc26
children fff3b58d031c
comparison
equal deleted inserted replaced
1435:e6fbefa96899 1436:8e1d86836efb
250 TOOL_BINARIES+= objlink data2inc gfxconv gentab 250 TOOL_BINARIES+= objlink data2inc gfxconv gentab
251 ifeq ($(SUP_MODLOAD),yes) 251 ifeq ($(SUP_MODLOAD),yes)
252 TOOL_BINARIES+= dumpmod mod2wav 252 TOOL_BINARIES+= dumpmod mod2wav
253 TESTS_BINARIES+= plrtest 253 TESTS_BINARIES+= plrtest
254 ifeq ($(DM_GFX_BLITS),yes) 254 ifeq ($(DM_GFX_BLITS),yes)
255 TOOL_BINARIES+= view64 255 TOOL_BINARIES+= 64vw
256 ifeq ($(DM_GFX_BM_TEXT),yes) 256 ifeq ($(DM_GFX_BM_TEXT),yes)
257 TOOL_BINARIES+= ppl 257 TOOL_BINARIES+= ppl
258 endif 258 endif
259 endif 259 endif
260 endif 260 endif
508 508
509 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o $(OBJPATH)libgfx.o $(DMLIB_A) 509 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o $(OBJPATH)libgfx.o $(DMLIB_A)
510 @echo " LINK $+" 510 @echo " LINK $+"
511 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) 511 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS)
512 512
513 $(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(OBJPATH)lib64gfx.o $(OBJPATH)libgfx.o $(DMLIB_A) 513 $(TOOL_BINPATH)64vw$(EXEEXT): $(OBJPATH)64vw.o $(OBJPATH)lib64gfx.o $(OBJPATH)libgfx.o $(DMLIB_A)
514 @echo " LINK $+" 514 @echo " LINK $+"
515 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) 515 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS)
516 516
517 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A) 517 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A)
518 @echo " LINK $+" 518 @echo " LINK $+"