Merge pull request #402 from friedkiwi/master

Fix incompatibility with latest mingw toolchain

src/win/Makefile.mingw

@@ -233,14 +233,14 @@ VPATH		:= $(EXPATH) . cpu \
 		    sound/resid-fp \
 		   scsi video network network/slirp win
 ifeq ($(X64), y)
-CPP		:= g++ -m64
+TOOL_PREFIX     := x86_64-w64-mingw32-
-CC		:= gcc -m64
 else
-CPP		:= g++ -m32
+TOOL_PREFIX     := i686-w64-mingw32-
-CC		:= gcc -m32
 endif
+CPP             := ${TOOL_PREFIX}g++
+CC              := ${TOOL_PREFIX}gcc
 WINDRES		:= windres
-STRIP := strip
+STRIP           := strip
 ifeq ($(ARM64), y)
 CPP		:= aarch64-w64-mingw32-g++
 CC		:= aarch64-w64-mingw32-gcc
@@ -467,6 +467,10 @@ endif
 CFLAGS		:= $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
 		   $(AFLAGS) -fomit-frame-pointer -mstackrealign -Wall \
 		   -fno-strict-aliasing
+
+# Add freetyp2 references through pkgconfig
+CFLAGS          := $(CFLAGS)  `pkg-config.exe --cflags freetype2`
+
 CXXFLAGS	:= $(CFLAGS)
 
 
@@ -634,9 +638,15 @@ OBJ		+= $(EXOBJ)
 endif
 
 LIBS		:= -mwindows \
-		   -lopenal.dll \
 		   -lddraw -ldxguid -ld3d9 \
 		   -lcomctl32 -lwinmm
+
+ifeq ($(STATIC), y)
+LIBS            += -lopenal -lole32
+else
+LIBS            += -lopenal.dll
+endif
+
 ifeq ($(D2D), y)
 LIBS		+= $(D2DLIB)
 endif
@@ -663,6 +673,10 @@ ifeq ($(D3DX), y)
 LIBS    += -ld3dx9
 endif
 
+ifeq ($(STATIC), y)
+LIBS    += -static
+endif
+
 # Build module rules.
 ifeq ($(AUTODEP), y)
 %.o:		%.c