From 7d87f25fdf9c1817a347f76e4bc011d0f3b351c6 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Fri, 27 Oct 2006 02:00:48 +0000
Subject: [PATCH] More MinGW fixes

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2465 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/build.vars.in           |  3 ++-
 sc2/build/unix/build.config | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sc2/build.vars.in b/sc2/build.vars.in
index 3a774a7d8..d97b1ea2f 100644
--- a/sc2/build.vars.in
+++ b/sc2/build.vars.in
@@ -39,8 +39,9 @@ uqm_HAVE_OPENGL='@HAVE_OPENGL@'
 uqm_USE_ZIP_IO='@USE_ZIP_IO@'
 uqm_USE_PLATFORM_ACCEL='@USE_PLATFORM_ACCEL@'
 uqm_NETPLAY='@NETPLAY@'
+uqm_USE_WINSOCK='@USE_WINSOCK@'
 DEBUG='@DEBUG@'
 export BUILD_SYSTEM HOST_SYSTEM DEBUG
 export MACRO_WIN32 MACRO__MCS_VER MACRO___MINGW32__
-export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX
+export uqm_SOUNDMODULE uqm_USE_INTERNAL_MIKMOD uqm_HAVE_REGEX uqm_USE_WINSOCK
 export uqm_HAVE_OPENGL uqm_USE_ZIP_IO uqm_USE_PLATFORM_ACCEL uqm_NETPLAY
diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index ae2b07584..a8c18314c 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -49,11 +49,13 @@ uqm_requirements()
 	define_have_symbol getopt_long
 	define_have_header regex.h
 
-	# Add an environment variable for MACRO_WIN32, MACRO__MCS_VER, and
-	# MACRO___MINGW32__
+	# Add an environment variable for MACRO_WIN32 and MACRO___MINGW32__
 	define_have_macro WIN32
-	define_have_macro _MCS_VER
 	define_have_macro __MINGW32__
+
+	if [ -n "$MACRO___MINGW32__" ]; then
+		USE_WINSOCK=1
+	fi
 }
 
 uqm_prepare_config()
@@ -342,7 +344,7 @@ uqm_process_config() {
 			MAKE ECHON SED DEBUG JOYSTICK NETPLAY \
 			SOUNDMODULE USE_INTERNAL_MIKMOD \
 			HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
-			USE_PLATFORM_ACCEL \
+			USE_PLATFORM_ACCEL USE_WINSOCK \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
 			REZ WINDRES"
 	SUBSTITUTE_FILES="build.vars"