Someone had made ifdefs that were confusing if compiling for Xbox. The conflictual situations have been resolved.

2005-05-30 23:43:37 +00:00
parent ee5e506200
commit 1b124c16a5
6 changed files with 7 additions and 8 deletions
@@ -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
@@ -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
@@ -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

@@ -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")
@@ -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
@@ -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>