Mercurial > hg > dmlib
diff Makefile.gen @ 912:70cbbd5b7aea
Moved lib64gfx files under tools, as it's not generic DMLIB module really.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 24 Feb 2015 00:47:39 +0200 |
| parents | 448eaa7239f0 |
| children | 38cad00b41dd |
line wrap: on
line diff
--- a/Makefile.gen Mon Feb 23 22:55:32 2015 +0200 +++ b/Makefile.gen Tue Feb 24 00:47:39 2015 +0200 @@ -231,7 +231,7 @@ ### Dependancies ifeq ($(DM_BUILD_TOOLS),yes) -DMLIB_OBJS += libgfx.o lib64gfx.o +DMLIB_OBJS += libgfx.o ifeq ($(DM_USE_STDIO),yes) TOOL_BINARIES+= objlink data2inc gfxconv gentab ifeq ($(SUP_MODLOAD),yes) @@ -485,11 +485,11 @@ @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -$(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(DMLIB_A) +$(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) -$(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(DMLIB_A) +$(TOOL_BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(OBJPATH)lib64gfx.o $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS)