Mercurial > hg > dmlib
changeset 1992:924a1188f697
Rename some Makefile variables.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sun, 01 Jul 2018 22:25:00 +0300 |
| parents | 822c5f46439d |
| children | 7190f4fbc0dd |
| files | Makefile.gen |
| diffstat | 1 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Sun Jul 01 21:31:05 2018 +0300 +++ b/Makefile.gen Sun Jul 01 22:25:00 2018 +0300 @@ -11,15 +11,15 @@ MKDIR_P ?= $(MKDIR) -p BINPATH ?= ./ DMLIB ?= ./ -TOOL_SRCPATH = $(DMLIB)tools/ -TESTS_SRCPATH = $(DMLIB)tests/ +TOOL_SRC = $(DMLIB)tools/ +TESTS_SRC = $(DMLIB)tests/ -TOOL_BINPATH ?= $(TOOL_SRCPATH) -TESTS_BINPATH ?= $(TESTS_SRCPATH) +TOOL_BINPATH ?= $(TOOL_SRC) +TESTS_BINPATH ?= $(TESTS_SRC) -DMLIBSRC = $(DMLIB)src/ +DMLIB_SRC = $(DMLIB)src/ -DM_CFLAGS += -I$(DMLIBSRC) +DM_CFLAGS += -I$(DMLIB_SRC) ifeq ($(EXTRA_CFLAGS),) EXTRA_CFLAGS=-O3 @@ -332,11 +332,11 @@ -$(OBJPATH)%.o: $(DMLIBSRC)%.c $(DMLIBSRC)%.h +$(OBJPATH)%.o: $(DMLIB_SRC)%.c $(DMLIB_SRC)%.h @echo " CC $<" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) -$(OBJPATH)%.o: $(DMLIBSRC)%.c +$(OBJPATH)%.o: $(DMLIB_SRC)%.c @echo " CC $<" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) @@ -357,11 +357,11 @@ $(MINIJSS)jmix_c.c: $(MINIJSS)jmix_c_in.c $(MINIJSS)jmixtmpl_c.h $(MINIJSS)jmix_post_c.h (echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@ -$(OBJPATH)dmimage.o: $(DMLIBSRC)dmimage.c $(DMLIBSRC)stb_image.c $(DMLIBSRC)dmimage.h +$(OBJPATH)dmimage.o: $(DMLIB_SRC)dmimage.c $(DMLIB_SRC)stb_image.c $(DMLIB_SRC)dmimage.h @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) -$(OBJPATH)dmresw.o: $(DMLIBSRC)dmresw.c $(DMLIBSRC)dmres.h +$(OBJPATH)dmresw.o: $(DMLIB_SRC)dmresw.c $(DMLIB_SRC)dmres.h @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) @@ -378,11 +378,11 @@ @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) -$(OBJPATH)dmblit.o: $(DMLIBSRC)dmblit.c $(DMLIBSRC)dmscaledblit.h $(DMLIBSRC)dmunscaledblit.h $(DMLIBSRC)dmblitfunc.h $(DMLIBSRC)dmlib.h +$(OBJPATH)dmblit.o: $(DMLIB_SRC)dmblit.c $(DMLIB_SRC)dmscaledblit.h $(DMLIB_SRC)dmunscaledblit.h $(DMLIB_SRC)dmblitfunc.h $(DMLIB_SRC)dmlib.h @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) -$(OBJPATH)dmline.o: $(DMLIBSRC)dmline.c $(DMLIBSRC)dmdrawline.h $(DMLIBSRC)dmlinefunc.h $(DMLIBSRC)dmlineclip.h $(DMLIBSRC)dmlib.h +$(OBJPATH)dmline.o: $(DMLIB_SRC)dmline.c $(DMLIB_SRC)dmdrawline.h $(DMLIB_SRC)dmlinefunc.h $(DMLIB_SRC)dmlineclip.h $(DMLIB_SRC)dmlib.h @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) @@ -398,19 +398,19 @@ $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt $(FONTCONV_BIN) $< $@ -$(DMLIBSRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf +$(DMLIB_SRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf $(DATA2INC_BIN) -q -C -n engineSetupFont -t Uint8 $< $@ -$(DMLIBSRC)setupimage.h: $(DMLIB)assets/SetupImage.png +$(DMLIB_SRC)setupimage.h: $(DMLIB)assets/SetupImage.png $(DATA2INC_BIN) -q -C -n engineSetupImage -t Uint8 $< $@ -$(DMLIBSRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png +$(DMLIB_SRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png $(DATA2INC_BIN) -q -C -n engineSetupMenuBar -t Uint8 $< $@ -$(OBJPATH)dmsimple.o: $(DMLIBSRC)dmsimple.c $(DMLIBSRC)dmengine.h \ - $(DMLIBSRC)setupmenubar.h $(DMLIBSRC)setupfont.h \ - $(DMLIBSRC)setupimage.h $(DMLIBSRC)dmsimple.c +$(OBJPATH)dmsimple.o: $(DMLIB_SRC)dmsimple.c $(DMLIB_SRC)dmengine.h \ + $(DMLIB_SRC)setupmenubar.h $(DMLIB_SRC)setupfont.h \ + $(DMLIB_SRC)setupimage.h $(DMLIB_SRC)dmsimple.c @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) @@ -468,7 +468,7 @@ @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) -$(OBJPATH)ppl.o: $(TOOL_SRCPATH)ppl.c $(MINIJSS)jssplr.h $(MINIJSS)jss.h $(MINIJSS)jssmod.h $(MINIJSS)jssmix.h $(DMLIBSRC)setupfont.h +$(OBJPATH)ppl.o: $(TOOL_SRC)ppl.c $(MINIJSS)jssplr.h $(MINIJSS)jss.h $(MINIJSS)jssmod.h $(MINIJSS)jssmix.h $(DMLIB_SRC)setupfont.h @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)