changeset 73:1096f6ffd15c

Adjustments for w64 builds.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 14 Aug 2012 04:34:57 +0300
parents 6549bf229549
children 91edd8d1a3f5
files Makefile
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Aug 14 03:09:08 2012 +0300
+++ b/Makefile	Tue Aug 14 04:34:57 2012 +0300
@@ -3,9 +3,13 @@
 LDFLAGS +=
 RANLIB=ranlib
 
+# Prefix for x86-32 win32 MinGW tools (gcc, ar, ld, ranlib)
 MINGW32_PREFIX=i686-w64-mingw32-
 MINGW32_PATH=/usr/i686-w64-mingw32
+
+# Prefix for x86-64 win64 MinGW tools
 MINGW64_PREFIX=x86_64-w64-mingw32-
+MINGW64_PATH=/usr/x86_64-w64-mingw32
 
 ### Subdirectories to build
 SUBDIRS=pwplib peluce nykyaeka oldchsool pwpzax
@@ -82,14 +86,14 @@
 	$(RM) config.mak && \
 	$(MAKE) config.mak PREFIX="$(MINGW32_PREFIX)" BINEXT=".exe" CC="gcc" \
 	XTARGET="$@" XCFLAGS="-DDRIVE_SDL `$(MINGW32_PATH)/bin/sdl-config --cflags`" \
-	XLDFLAGS="-s -L$(MINGW32_PATH)/lib/ `$(MINGW32_PATH)/bin/sdl-config --libs` -lwinmm" && \
+	XLDFLAGS="-s -L$(MINGW32_PATH)/lib/ `$(MINGW32_PATH)/bin/sdl-config --libs` -lwinmm -lm" && \
 	$(MAKE) all
 
 sdl-win64:
 	$(RM) config.mak && \
 	$(MAKE) config.mak PREFIX="$(MINGW64_PREFIX)" BINEXT=".exe" CC="gcc" \
 	XTARGET="$@" XCFLAGS="-DDRIVE_SDL `$(MINGW64_PATH)/bin/sdl-config --cflags`" \
-	XLDFLAGS="-s -L$(MINGW64_PATH)/lib/ `$(MINGW64_PATH)/bin/sdl-config --libs` -lwinmm" && \
+	XLDFLAGS="-s -L$(MINGW64_PATH)/lib/ `$(MINGW64_PATH)/bin/sdl-config --libs` -lwinmm -lm" && \
 	$(MAKE) all
 
 PACKAGE=pwpunix-1.96-sdl