comparison Makefile.gen @ 716:24096d1ef794

Make pre-built header versions of assets not depend on fontconv and data2inc.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 17 Apr 2013 21:54:34 +0300
parents 0ad76fa080ca
children 12ddeef948fc
comparison
equal deleted inserted replaced
715:a20f127e6e1b 716:24096d1ef794
250 250
251 ifeq ($(DM_BUILD_TESTS),yes) 251 ifeq ($(DM_BUILD_TESTS),yes)
252 TESTS_BINARIES += vecmattest fptest evaltest 252 TESTS_BINARIES += vecmattest fptest evaltest
253 endif 253 endif
254 254
255 FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT) 255 FONTCONV_BIN=fontconv
256 DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT) 256 DATA2INC_BIN=data2inc
257 257
258 258
259 ### 259 ###
260 ### Rest of the rules 260 ### Rest of the rules
261 ### 261 ###
373 $(OBJPATH)libgfx.o: $(DMLIB)libgfx.c $(DMLIB)libgfx.h 373 $(OBJPATH)libgfx.o: $(DMLIB)libgfx.c $(DMLIB)libgfx.h
374 @echo " CC $+" 374 @echo " CC $+"
375 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(LIBPNG_CFLAGS) 375 @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(LIBPNG_CFLAGS)
376 376
377 377
378 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_BIN) 378 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt
379 $(FONTCONV_BIN) -o $@ $< 379 $(FONTCONV_BIN) -o $@ $<
380 380
381 $(DMLIB)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_BIN) 381 $(DMLIB)setupfont.h: $(DMLIB)assets/SetupFont.dmf
382 $(DATA2INC_BIN) -q -C -n engineSetupFont -t Uint8 $< $@ 382 $(DATA2INC_BIN) -q -C -n engineSetupFont -t Uint8 $< $@
383 383
384 $(DMLIB)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_BIN) 384 $(DMLIB)setupimage.h: $(DMLIB)assets/SetupImage.png
385 $(DATA2INC_BIN) -q -C -n engineSetupImage -t Uint8 $< $@ 385 $(DATA2INC_BIN) -q -C -n engineSetupImage -t Uint8 $< $@
386 386
387 $(DMLIB)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_BIN) 387 $(DMLIB)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png
388 $(DATA2INC_BIN) -q -C -n engineSetupMenuBar -t Uint8 $< $@ 388 $(DATA2INC_BIN) -q -C -n engineSetupMenuBar -t Uint8 $< $@
389 389
390 390
391 $(OBJPATH)dmsimple.o: $(DMLIB)dmsimple.c $(DMLIB)dmengine.h \ 391 $(OBJPATH)dmsimple.o: $(DMLIB)dmsimple.c $(DMLIB)dmengine.h \
392 $(DMLIB)setupmenubar.h $(DMLIB)setupfont.h \ 392 $(DMLIB)setupmenubar.h $(DMLIB)setupfont.h \
431 431
432 432
433 ### 433 ###
434 ### Tools 434 ### Tools
435 ### 435 ###
436 $(FONTCONV_BIN): $(OBJPATH)fontconv.o $(DMLIB_A) 436 $(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
437 @echo " LINK $+" 437 @echo " LINK $+"
438 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf 438 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
439 439
440 $(DATA2INC_BIN): $(OBJPATH)data2inc.o $(DMLIB_A) 440 $(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
441 @echo " LINK $+" 441 @echo " LINK $+"
442 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) 442 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
443 443
444 $(TOOL_BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A) 444 $(TOOL_BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
445 @echo " LINK $+" 445 @echo " LINK $+"