--- a/Makefile.gen	Sat Nov 03 08:11:56 2012 +0200
+++ b/Makefile.gen	Sat Nov 03 08:21:29 2012 +0200
@@ -57,9 +57,9 @@
 ###
 ifeq ($(DM_USE_PACKFS),yes)
 BUILD_RES=yes
-DM_CFLAGS += -DDM_USE_PACKFS
+DM_CFLAGS += -DDM_USE_PACKFS $(ZLIB_CFLAGS)
+DM_LDFLAGS += $(ZLIB_LDFLAGS)
 DMLIB_OBJS += dmpack.o dmpackutil.o
-DM_LDFLAGS += -lz
 ifeq ($(DM_BUILD_TOOLS),yes)
 BINARIES += packed
 endif
@@ -219,7 +219,7 @@
 
 
 ifeq ($(DM_USE_LIBPNG),yes)
-DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS)
+DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
 endif
 
 ###
@@ -384,7 +384,7 @@
 
 $(BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS)
 
 $(BINPATH)view64$(EXEEXT): $(OBJPATH)view64.o $(DMLIB_A)
 	@echo " LINK $+"