Mercurial > hg > dmlib

comparison Makefile.gen @ 424:e88b2993801c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build for Win32.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 03 Nov 2012 08:21:29 +0200
parents f18f07d8a731
children e4a3f183e463
comparison
equal deleted inserted replaced
423:11b3adb3bdb1 424:e88b2993801c
55 ### 55 ###
56 ### Filesystem 56 ### Filesystem
57 ### 57 ###
58 ifeq ($(DM_USE_PACKFS),yes) 58 ifeq ($(DM_USE_PACKFS),yes)
59 BUILD_RES=yes 59 BUILD_RES=yes
60 DM_CFLAGS += -DDM_USE_PACKFS 60 DM_CFLAGS += -DDM_USE_PACKFS $(ZLIB_CFLAGS)
61 DM_LDFLAGS += $(ZLIB_LDFLAGS)
61 DMLIB_OBJS += dmpack.o dmpackutil.o 62 DMLIB_OBJS += dmpack.o dmpackutil.o
62 DM_LDFLAGS += -lz
63 ifeq ($(DM_BUILD_TOOLS),yes) 63 ifeq ($(DM_BUILD_TOOLS),yes)
64 BINARIES += packed 64 BINARIES += packed
65 endif 65 endif
66 endif 66 endif
67 67
217 217
218 endif 218 endif
219 219
220 220
221 ifeq ($(DM_USE_LIBPNG),yes) 221 ifeq ($(DM_USE_LIBPNG),yes)
222 DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS) 222 DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
223 endif 223 endif
224 224
225 ### 225 ###
226 ### Rest of the rules 226 ### Rest of the rules
227 ### 227 ###
382 @echo " LINK $+" 382 @echo " LINK $+"
383 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) 383 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
384 384
385 $(BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(DMLIB_A) 385 $(BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(DMLIB_A)
386 @echo " LINK $+" 386 @echo " LINK $+"
387 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) 387 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS)
388 388
389 $(BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(DMLIB_A) 389 $(BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(DMLIB_A)
390 @echo " LINK $+" 390 @echo " LINK $+"
391 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) 391 @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
392 392