From a1b500da49fdb283476bb284de51f7da3ea0de40 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <dvpdiner2@gmail.com>
Date: Sat, 4 Feb 2012 20:06:15 -0800
Subject: [PATCH] More MinGW fixes.

---
 Sources/Plasma/Apps/plClientPatcher/CMakeLists.txt             | 1 +
 .../NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp   | 2 +-
 Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp             | 2 +-
 Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp    | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Sources/Plasma/Apps/plClientPatcher/CMakeLists.txt b/Sources/Plasma/Apps/plClientPatcher/CMakeLists.txt
index 21e3d82e..7e99acda 100644
--- a/Sources/Plasma/Apps/plClientPatcher/CMakeLists.txt
+++ b/Sources/Plasma/Apps/plClientPatcher/CMakeLists.txt
@@ -18,6 +18,7 @@ set(plClientPatcher_SOURCES
 )
 
 add_library(plClientPatcher STATIC ${plClientPatcher_HEADERS} ${plClientPatcher_SOURCES})
+target_link_libraries(plClientPatcher CoreLib plAudioCore)
 
 source_group("Header Files" FILES ${plClientPatcher_HEADERS})
 source_group("Source Files" FILES ${plClientPatcher_SOURCES})
diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp
index e4ef0e54..cf291ac8 100644
--- a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp
+++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp
@@ -219,7 +219,7 @@ AsyncId CThreadDispObject::Queue (void * op) {
 ***/
 
 //===========================================================================
-static unsigned CALLBACK W9xThreadProc (AsyncThread *) {
+static unsigned THREADCALL W9xThreadProc (AsyncThread *) {
 
     // Perform the main thread loop
     for (;;) {
diff --git a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp
index 75a44c55..91c61abc 100644
--- a/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp
+++ b/Sources/Plasma/PubUtilLib/plAudio/plEAXEffects.cpp
@@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <al.h>
 
 #if HS_BUILD_FOR_WIN32
-#    ifdef DX_OLD_SDK
+#    if defined(DX_OLD_SDK) || defined(__MINGW32__)
 #        include <dxerr9.h>
 #    else
 #        include <dxerr.h>
diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp
index e9b3bdf2..da69d874 100644
--- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp
+++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.cpp
@@ -47,10 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetMessage/plNetMessage.h"
 #include "plNetClient/plNetClientMgr.h"
 #include <algorithm>
-
-#if HS_BUILD_FOR_UNIX
 #include <float.h>
-#endif
 
 plNetTransport::~plNetTransport()
 {