Mercurial > hg > dmlib

comparison Makefile.gen @ 1307:43b13dbbdcd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved libgfx to tools/ as it's not really a very generic piece of code that belongs to the engine ..
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 19 Aug 2017 15:18:29 +0300
parents 42f5680f904d
children 5ad7d780a09b
comparison
equal deleted inserted replaced
1306:696c58784635 1307:43b13dbbdcd1
247 endif 247 endif
248 248
249 249
250 ### Dependancies 250 ### Dependancies
251 ifeq ($(DM_BUILD_TOOLS),yes) 251 ifeq ($(DM_BUILD_TOOLS),yes)
252 DMLIB_OBJS += libgfx.o
253 ifeq ($(DM_USE_STDIO),yes) 252 ifeq ($(DM_USE_STDIO),yes)
254 TOOL_BINARIES+= objlink data2inc gfxconv gentab 253 TOOL_BINARIES+= objlink data2inc gfxconv gentab
255 ifeq ($(SUP_MODLOAD),yes) 254 ifeq ($(SUP_MODLOAD),yes)
256 TOOL_BINARIES+= dumpmod mod2wav 255 TOOL_BINARIES+= dumpmod mod2wav
257 TESTS_BINARIES+= plrtest 256 TESTS_BINARIES+= plrtest
412 411
413 $(OBJPATH)dmargs.o: $(DMLIBSRC)dmargs.c $(DMLIBSRC)dmargs.h $(DMLIBSRC)dmargs_int.c $(DMLIBSRC)dmlib.h 412 $(OBJPATH)dmargs.o: $(DMLIBSRC)dmargs.c $(DMLIBSRC)dmargs.h $(DMLIBSRC)dmargs_int.c $(DMLIBSRC)dmlib.h
414 @echo " CC $+" 413 @echo " CC $+"
415 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) 414 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
416 415
417 $(OBJPATH)libgfx.o: $(DMLIBSRC)libgfx.c $(DMLIBSRC)libgfx.h 416 $(OBJPATH)libgfx.o: $(DMLIB)tools/libgfx.c $(DMLIB)tools/libgfx.h
418 @echo " CC $+" 417 @echo " CC $+"
419 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(LIBPNG_CFLAGS) 418 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(LIBPNG_CFLAGS)
420 419
421 420
422 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt 421 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt
511 510
512 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A) 511 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A)
513 @echo " LINK $+" 512 @echo " LINK $+"
514 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS) 513 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
515 514
516 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o $(DMLIB_A) 515 $(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o $(OBJPATH)libgfx.o $(DMLIB_A)
517 @echo " LINK $+" 516 @echo " LINK $+"
518 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(DM_ZLIB_LDFLAGS) 517 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(DM_ZLIB_LDFLAGS)
519 518
520 $(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(OBJPATH)lib64gfx.o $(DMLIB_A) 519 $(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(OBJPATH)lib64gfx.o $(OBJPATH)libgfx.o $(DMLIB_A)
521 @echo " LINK $+" 520 @echo " LINK $+"
522 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(DM_ZLIB_LDFLAGS) $(SDL_LDFLAGS) 521 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(DM_ZLIB_LDFLAGS) $(SDL_LDFLAGS)
523 522
524 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A) 523 $(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A)
525 @echo " LINK $+" 524 @echo " LINK $+"