Mercurial > hg > dmlib
diff Makefile.gen @ 2291:4f3bd5710585
Merge.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 03 Jul 2019 01:52:19 +0300 |
parents | a46a5d2833bb |
children | 15f75ed4f2cc |
line wrap: on
line diff
--- a/Makefile.gen Wed Jul 03 01:52:01 2019 +0300 +++ b/Makefile.gen Wed Jul 03 01:52:19 2019 +0300 @@ -129,7 +129,6 @@ ifeq ($(DM_GFX_BLITS),yes) DM_CFLAGS += -DDM_GFX_BLITS DMLIB_OBJS += dmblit.o -endif ifeq ($(DM_GFX_BM_TEXT),yes) DM_CFLAGS += -DDM_GFX_BM_TEXT @@ -140,6 +139,7 @@ endif endif endif +endif ifeq ($(DM_GFX_TTF_TEXT),yes) DM_CFLAGS += -DDM_GFX_TTF_TEXT @@ -308,11 +308,7 @@ TESTS_TARGETS = $(addprefix $(TESTS_BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES))) TOOL_TARGETS = $(addprefix $(TOOL_BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES))) TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \ - $(TOOL_TARGETS) $(TESTS_TARGETS) \ - $(DMLIB)assets/SetupFont.dmf \ - $(DMLIB_SRC)setupfont.h \ - $(DMLIB_SRC)setupimage.h \ - $(DMLIB_SRC)setupmenubar.h + $(TOOL_TARGETS) $(TESTS_TARGETS) #NONBUILD +=