From 1b124c16a5fde853d26170f3ed5c5d047969a062 Mon Sep 17 00:00:00 2001
From: Renaud Lepage <jsrlepage@users.sourceforge.net>
Date: Mon, 30 May 2005 23:43:37 +0000
Subject: [PATCH] Someone had made ifdefs that were confusing if compiling for
 Xbox. The conflictual situations have been resolved.

---
 stepmania/src/LuaManager.cpp                    | 5 ++---
 stepmania/src/RageDisplay_D3D.cpp               | 2 +-
 stepmania/src/RageSoundReader_Resample_Good.cpp | 2 +-
 stepmania/src/RageSoundReader_Vorbisfile.cpp    | 2 +-
 stepmania/src/RageUtil.cpp                      | 2 +-
 stepmania/src/ezsockets.cpp                     | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp
index 6f3185e9c0..d7e1bbf62c 100644
--- a/stepmania/src/LuaManager.cpp
+++ b/stepmania/src/LuaManager.cpp
@@ -14,11 +14,10 @@
 LuaManager *LUA = NULL;
 static LuaFunctionList *g_LuaFunctions = NULL;
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_XBOX)
 	#pragma comment(lib, "lua-5.0/lib/LibLua.lib")
 	#pragma comment(lib, "lua-5.0/lib/LibLuaLib.lib")
-#endif
-#if defined(_XBOX)
+#elif defined(_XBOX)
 	#pragma comment(lib, "lua-5.0/lib/LibLuaXbox.lib")
 	#pragma comment(lib, "lua-5.0/lib/LibLuaLibXbox.lib")
 #endif
diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp
index fc5b789493..84977aa757 100644
--- a/stepmania/src/RageDisplay_D3D.cpp
+++ b/stepmania/src/RageDisplay_D3D.cpp
@@ -31,7 +31,7 @@
 
 // Static libraries
 // load Windows D3D8 dynamically
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_XBOX)
 	#pragma comment(lib, "D3dx8.lib")
 	#pragma comment(lib, "Dxerr8.lib")
 #endif
diff --git a/stepmania/src/RageSoundReader_Resample_Good.cpp b/stepmania/src/RageSoundReader_Resample_Good.cpp
index 090965e7a6..85a0aa57de 100644
--- a/stepmania/src/RageSoundReader_Resample_Good.cpp
+++ b/stepmania/src/RageSoundReader_Resample_Good.cpp
@@ -4,7 +4,7 @@
 #include "RageSoundReader_Resample_Good.h"
 
 #include "libresample/include/libresample.h"
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_XBOX)
 #pragma comment(lib, "libresample/resample.lib")
 #endif
 
diff --git a/stepmania/src/RageSoundReader_Vorbisfile.cpp b/stepmania/src/RageSoundReader_Vorbisfile.cpp
index e9df2a2bdb..4dbb70683c 100644
--- a/stepmania/src/RageSoundReader_Vorbisfile.cpp
+++ b/stepmania/src/RageSoundReader_Vorbisfile.cpp
@@ -20,7 +20,7 @@
 #pragma comment(lib, "vorbis/xbox/vorbis_static.lib")
 #pragma comment(lib, "vorbis/xbox/vorbisfile_static.lib")
 #endif
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && !defined(_XBOX)
 #pragma comment(lib, "vorbis/win32/ogg_static.lib")
 #pragma comment(lib, "vorbis/win32/vorbis_static.lib")
 #pragma comment(lib, "vorbis/win32/vorbisfile_static.lib")
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index 728e9b8806..bdcdb368e8 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -228,7 +228,7 @@ CString vssprintf( const char *fmt, va_list argList)
 #else
 #  include <windows.h>
 #  include <dxerr8.h>
-#  if defined(_MSC_VER)
+#  if defined(_MSC_VER) && !defined(_XBOX)
 #    pragma comment(lib, "dxerr8.lib")
 #  endif
 #endif
diff --git a/stepmania/src/ezsockets.cpp b/stepmania/src/ezsockets.cpp
index 0f77ffa813..eafc515456 100644
--- a/stepmania/src/ezsockets.cpp
+++ b/stepmania/src/ezsockets.cpp
@@ -9,7 +9,7 @@
 #include "ezsockets.h"
 
 #if defined(_XBOX)
-#elif defined(_MSC_VER) // We need the WinSock32 Library on Windows
+#elif defined(_MSC_VER) && !defined(_XBOX) // We need the WinSock32 Library on Windows
 #pragma comment(lib,"wsock32.lib")
 #else
 #include <sys/types.h>