From 436aad096f1034c77616feb5a28780944ea20733 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Mon, 23 Jul 2007 18:55:10 +0000
Subject: [PATCH] Fixed bugs caused by last commit...

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2549 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/Makefile | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/engine/Makefile b/engine/Makefile
index 1120d60cc..56ffd91f2 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -11,6 +11,14 @@ BASE_DIR=.
 #linux->win32
 #if you are cross compiling, you'll need to use FTE_TARGET=mytaget
 
+#correct the gcc build when cross compiling
+ifeq ($(FTE_TARGET),win32)
+	ifeq ($(shell $(CC) -v 2>&1 | grep mingw),)
+		#CC didn't state that it was mingw... so try fixing that up
+		CC=i586-mingw32msvc-gcc
+		W32_FLAGS=-Ilibs/dxsdk7/include
+	endif
+endif
 
 ifeq ($(FTE_TARGET),) 	#user didn't specify prefered target
 	ifneq ($(shell $(CC) -v 2>&1 | grep mingw),)
@@ -83,7 +91,7 @@ endif
 ifeq ($(FTE_TARGET),bsd)
 	BASELDFLAGS=-lm
 endif
-BASELDFLAGS ?= -lm -ldl
+BASELDFLAGS ?= -lm -ldl -lpthread
 
 #BASELDFLAGS=-lm  -lz
 GLXLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lpng -ljpeg
@@ -119,7 +127,7 @@ else
 	BASE_ASM_CFLAGS = -DNOASM
 endif
 
-BASE_CFLAGS=$(BASE_ASM_CFLAGS) -Wall -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(SW_DIR) -I$(GL_DIR) -I$(PROGS_DIR) -I$(LIBS_DIR) -I$(QUX_DIR) -I$(LIBS_DIR)/dxsdk7/include -I$(LIBS_DIR)/sdl/include -I$(LIBS_DIR)/sdl/include/SDL -D_vsnprintf=vsnprintf -D_snprintf=snprintf
+BASE_CFLAGS=$(BASE_ASM_CFLAGS) -Wall -Dstrnicmp=strncasecmp -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) -I$(COMMON_DIR) -I$(SW_DIR) -I$(GL_DIR) -I$(PROGS_DIR) -I$(LIBS_DIR) -I$(LIBS_DIR)/dxsdk7/include -I$(LIBS_DIR)/sdl/include -I$(LIBS_DIR)/sdl/include/SDL -D_vsnprintf=vsnprintf -D_snprintf=snprintf
 CLIENT_ONLY_CFLAGS=-DCLIENTONLY
 SERVER_ONLY_CFLAGS=-DSERVERONLY
 JOINT_CFLAGS=
@@ -487,7 +495,7 @@ else
 endif
 	SW_EXE_NAME=../fteqw.sw
 	SWCL_EXE_NAME=../fteqwcl.sw
-	SW_LDFLAGS=$(SWLDFLAGS) $(XLDFLAGS)
+	SW_LDFLAGS=$(SWLDFLAGS) $(XLDFLAGS) -lXxf86vm
 	SW_CFLAGS=$(SWCFLAGS) -I/usr/X11R6/include
 	SWB_DIR=sw_linux
 	SWCL_DIR=swcl_linux