comparison Makefile.gen @ 912:70cbbd5b7aea

Moved lib64gfx files under tools, as it's not generic DMLIB module really.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 24 Feb 2015 00:47:39 +0200
parents 448eaa7239f0
children 38cad00b41dd
comparison
equal deleted inserted replaced
911:602b4aa34293 912:70cbbd5b7aea
229 endif 229 endif
230 230
231 231
232 ### Dependancies 232 ### Dependancies
233 ifeq ($(DM_BUILD_TOOLS),yes) 233 ifeq ($(DM_BUILD_TOOLS),yes)
234 DMLIB_OBJS += libgfx.o lib64gfx.o 234 DMLIB_OBJS += libgfx.o
235 ifeq ($(DM_USE_STDIO),yes) 235 ifeq ($(DM_USE_STDIO),yes)
236 TOOL_BINARIES+= objlink data2inc gfxconv gentab 236 TOOL_BINARIES+= objlink data2inc gfxconv gentab
237 ifeq ($(SUP_MODLOAD),yes) 237 ifeq ($(SUP_MODLOAD),yes)
238 TOOL_BINARIES+= viewmod mod2wav 238 TOOL_BINARIES+= viewmod mod2wav
239 TESTS_BINARIES+= plrtest 239 TESTS_BINARIES+= plrtest
483 483
484 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A) 484 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A)
485 @echo " LINK $+" 485 @echo " LINK $+"
486 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) 486 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
487 487
488 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(DMLIB_A) 488 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o $(DMLIB_A)
489 @echo " LINK $+" 489 @echo " LINK $+"
490 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) 490 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS)
491 491
492 $(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(DMLIB_A) 492 $(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(OBJPATH)lib64gfx.o $(DMLIB_A)
493 @echo " LINK $+" 493 @echo " LINK $+"
494 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) 494 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS)
495 495
496 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A) 496 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A)
497 @echo " LINK $+" 497 @echo " LINK $+"