Mercurial > hg > dmlib

comparison Makefile.gen @ 421:f18f07d8a731

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix building with libpng.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 03 Nov 2012 07:54:23 +0200
parents 24548dba1eb6
children e88b2993801c
comparison
equal deleted inserted replaced
420:8d15443ce209 421:f18f07d8a731
216 DMLIB_OBJS += jss.o jssmix.o jssmod.o jssplr.o 216 DMLIB_OBJS += jss.o jssmix.o jssmod.o jssplr.o
217 217
218 endif 218 endif
219 219
220 220
221 ifeq ($(DM_USE_LIBPNG),yes)
222 DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS)
223 endif
224
221 ### 225 ###
222 ### Rest of the rules 226 ### Rest of the rules
223 ### 227 ###
224 CFLAGS += -g -W -Wall -DHAVE_STRING_H $(EXTRA_CFLAGS) 228 CFLAGS += -g -W -Wall -DHAVE_STRING_H $(EXTRA_CFLAGS)
225 CXXFLAGS=$(CFLAGS) 229 CXXFLAGS=$(CFLAGS)
378 @echo " LINK $+" 382 @echo " LINK $+"
379 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) 383 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
380 384
381 $(BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(DMLIB_A) 385 $(BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(DMLIB_A)
382 @echo " LINK $+" 386 @echo " LINK $+"
383 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_CFLAGS) $(LIBPNG_LDFLAGS) 387 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS)
384 388
385 $(BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(DMLIB_A) 389 $(BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(DMLIB_A)
386 @echo " LINK $+" 390 @echo " LINK $+"
387 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) 391 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
388 392