Merge pull request #1210 from heuripedes/master

(Makefile.win) Use bundled zlib library by default
This commit is contained in:
Twinaphex 2014-10-27 21:07:08 +01:00
commit 4bc159e1db

View File

@ -33,6 +33,7 @@ HAVE_FFMPEG := 0
HAVE_CG := 1
HAVE_LIBXML2 := 0
HAVE_ZLIB := 1
WANT_MINIZ := 1
ifeq ($(HAVE_CG), 1)
CG_LIBS := -lcg -lcgGL