Mercurial > hg > dmlib
diff Makefile.gen @ 587:296133d29611
Fix and improve build process.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 12 Apr 2013 05:20:12 +0300 |
| parents | 923d920a8a85 |
| children | 8a9361179a1a |
line wrap: on
line diff
--- a/Makefile.gen Fri Apr 12 05:13:31 2013 +0300 +++ b/Makefile.gen Fri Apr 12 05:20:12 2013 +0300 @@ -3,14 +3,14 @@ ### include config.mak +BINPATH ?= ./ +DMLIB ?= ./ +DM_CFLAGS += -I$(DMLIB) + ifeq ($(EXTRA_CFLAGS),) EXTRA_CFLAGS=-O3 -march=core2 -DDM_DEVEL endif -ifneq ($(DMLIB),) -DM_CFLAGS += -I$(DMLIB) -endif - ### ### Editor @@ -255,7 +255,8 @@ DATA2INC_BIN=$(BINPATH)data2inc$(EXEEXT) TOOL_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES))) -TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) $(TOOL_TARGETS) +TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \ + $(TOOL_TARGETS) $(DMLIB)setupfont.h $(DMLIB)setupimage.h all: $(TARGETS) @@ -379,10 +380,13 @@ $(DMLIB)graphics/SetupFont.dmf: $(DMLIB)graphics/SetupFont.fnt $(FONTCONV_BIN) -o $@ $< -setupfont.h: $(DMLIB)graphics/SetupFont.dmf +$(DMLIB)setupfont.h: $(DMLIB)graphics/SetupFont.dmf $(DATA2INC_BIN) -C -n engineSetupFont -t Uint8 $< $@ -$(BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(DMLIB_A) setupfont.h +$(DMLIB)setupimage.h: $(DMLIB)graphics/SetupImage.png + $(DATA2INC_BIN) -C -n engineSetupImage -t Uint8 $< $@ + +$(BINPATH)ppl$(EXEEXT): $(DMLIB)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)