diff Makefile.w32 @ 533:52c56ada3816

Fix Win32/MinGW cross-compilation target to work with Debian's gcc-mingw-w64 package, thus upgrading to a new version of MinGW and GCC. Yay.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 07 Jun 2012 03:16:39 +0300
parents 4e178dfd0cc3
children 1014822abaf1
line wrap: on
line diff
--- a/Makefile.w32	Wed Jun 06 18:55:17 2012 +0300
+++ b/Makefile.w32	Thu Jun 07 03:16:39 2012 +0300
@@ -1,30 +1,19 @@
 #
 # For win32 version cross-compilation with MinGW suite @ Linux
 #
-SDL=y
-
-# Set PATH to include MinGW cross compiler path FIRST!
-PATH=/usr/local/i386-mingw32/bin:/usr/bin:/bin:/usr/local/bin
 
 # C-compiler, flags and linker flags
-CC=gcc
-CFLAGS=-DHAVE_STRING_H -Ipdcurses -mwindows
-
-# Library path must be defined correctly here
-LDFLAGS=-L/usr/local/i386-mingw32/lib/ -liberty -lws2_32 -lole32 -s -mwindows
+CC=i686-w64-mingw32-gcc
+AR=i686-w64-mingw32-ar
+RANLIB=i686-w64-mingw32-ranlib
 
-# Link PDCurses static library here .. you will want to change this
-ifeq ($(SDL),y)
-LDFLAGS+=pdcurses/libpdcurses-sdl.a -lSDL
-else
-LDFLAGS+=pdcurses/libpdcurses.a
-endif
+CFLAGS=-DHAVE_STRING_H -Ipdcurses -mwindows
+LDFLAGS= -lws2_32 -lole32 -mwindows pdcurses/libpdcurses.a -lSDL -s
 
 # Miscellaneous
 EXEEXT=.exe
 OBJPATH=./win32/
 BINPATH=./installer/
-#BINPATH=/misc/wine_c/
 NONBUILD=$(OBJPATH)
 
 EXTRAOBJS= resource.o