Mercurial > hg > batmud > maputils

changeset 1759:7884848298bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix MinGW cross compilation.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 20 Oct 2017 15:55:57 +0300
parents bb9c78c70b1b
children 9c9b9e0f78d2
files Makefile.w32
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.w32	Fri Oct 20 15:23:17 2017 +0300
+++ b/Makefile.w32	Fri Oct 20 15:55:57 2017 +0300
@@ -1,7 +1,7 @@
 #
 # For win32 version cross-compilation with MiNGW suite @ Linux
 #
-MINGW_PREFIX=i686-w64-mingw32-
+BINTOOL_PREFIX=i686-w64-mingw32-
 
 PREFIX  = ./win32/
 BINPATH = ./win32/
@@ -10,15 +10,13 @@
 INSTALL = 
 
 # C-compiler, etc
-CC=$(MINGW_PREFIX)gcc
-AR=$(MINGW_PREFIX)ar
-RANLIB=$(MINGW_PREFIX)ranlib
-WINDRES=$(MINGW_PREFIX)windres
+RANLIB=$(BINTOOL_PREFIX)ranlib
+WINDRES=$(BINTOOL_PREFIX)windres
 
 CFLAGS += -DHAVE_STRING_H -DHAVE_STDINT_H
 LDFLAGS +=
 
 LIBPNG_CFLAGS += -DHAVE_LIBPNG
-LIBPNG_LDFLAGS += -lpng
+LIBPNG_LDFLAGS += -lpng -lz
 
 include Makefile.gen