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

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2467 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/libs/network/Makeinfo            | 2 +-
 sc2/src/sc2code/libs/network/netmanager/Makeinfo | 2 +-
 sc2/src/sc2code/libs/network/socket/Makeinfo     | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sc2/src/sc2code/libs/network/Makeinfo b/sc2/src/sc2code/libs/network/Makeinfo
index 208974911..1278f91d4 100644
--- a/sc2/src/sc2code/libs/network/Makeinfo
+++ b/sc2/src/sc2code/libs/network/Makeinfo
@@ -1,6 +1,6 @@
 uqm_SUBDIRS="connect netmanager socket"
 uqm_CFILES="netport.c"
-if [ -n "$MACRO___MINGW32__" ]; then
+if [ -n "$uqm_USE_WINSOCK" ]; then
 	uqm_CFILES="$uqm_CFILES network_win.c"
 else
 	uqm_CFILES="$uqm_CFILES network_bsd.c"
diff --git a/sc2/src/sc2code/libs/network/netmanager/Makeinfo b/sc2/src/sc2code/libs/network/netmanager/Makeinfo
index 7fb4fa8dc..714914d95 100644
--- a/sc2/src/sc2code/libs/network/netmanager/Makeinfo
+++ b/sc2/src/sc2code/libs/network/netmanager/Makeinfo
@@ -1,5 +1,5 @@
 uqm_CFILES="ndesc.c"
-if [ -n "$MACRO___MINGW32__" ]; then
+if [ -n "$uqm_USE_WINSOCK" ]; then
 	uqm_CFILES="$uqm_CFILES netmanager_win.c"
 else
 	uqm_CFILES="$uqm_CFILES netmanager_bsd.c"
diff --git a/sc2/src/sc2code/libs/network/socket/Makeinfo b/sc2/src/sc2code/libs/network/socket/Makeinfo
index bc23703c3..5c605f1f4 100644
--- a/sc2/src/sc2code/libs/network/socket/Makeinfo
+++ b/sc2/src/sc2code/libs/network/socket/Makeinfo
@@ -1,2 +1,7 @@
-uqm_CFILES="socket_bsd.c socket.c"
+uqm_CFILES="socket.c"
+if [ -n "$uqm_USE_WINSOCK" ]; then
+	uqm_CFILES="$uqm_CFILES socket_win.c"
+else
+	uqm_CFILES="$uqm_CFILES socket_bsd.c"
+fi