Be a bit more robust to build environment changes.

Reduce some module dependencies.
Clean up some unused instantiations.

This was SVN commit r9827.

source/lib/external_libraries/enet.h

@@ -39,7 +39,9 @@ struct fd_set;
 
 #define _WINSOCK2API_	// winsock2.h include guard
 
-#define WIN32
+#ifndef WIN32
+# define WIN32
+#endif
 
 #endif	// OS_WIN
 

source/pch/engine/precompiled.h

@@ -27,7 +27,6 @@
 // .. CStr is included very frequently, so a reasonable amount of time is
 //    saved by including it here. (~10% in a full rebuild, as of r2365)
 #include "ps/CStr.h"
-#include "scripting/SpiderMonkey.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 

source/ps/Preprocessor.cpp

@@ -763,7 +763,7 @@ CPreprocessor::Token CPreprocessor::GetArgument (Token &oArg, bool iExpand)
         }
     }
 
-    uint len = oArg.Length;
+    unsigned int len = oArg.Length;
     while (true)
     {
         Token t = GetToken (iExpand);

source/renderer/Renderer.h

@@ -26,7 +26,6 @@
 #include "graphics/Camera.h"
 #include "graphics/SColor.h"
 #include "graphics/ShaderProgram.h"
-#include "lib/ogl.h"
 #include "lib/res/handle.h"
 #include "ps/Singleton.h"
 #include "scripting/ScriptableObject.h"
@@ -234,7 +233,7 @@ public:
 	void SetDisplayTerrainPriorities(bool enabled) { m_DisplayTerrainPriorities = enabled; }
 
 	// bind a GL texture object to active unit
-	void BindTexture(int unit,GLuint tex);
+	void BindTexture(int unit, unsigned int tex);
 
 	// load the default set of alphamaps.
 	// return a negative error code if anything along the way fails.

source/scriptinterface/ScriptTypes.h

@@ -20,7 +20,9 @@
 
 #ifdef _WIN32
 # define XP_WIN
-# define WIN32 // SpiderMonkey expects this
+# ifndef WIN32
+#  define WIN32 // SpiderMonkey expects this
+# endif
 
 // The jsval struct type causes crashes due to weird miscompilation
 // issues in (at least) VC2008, so force it to be the less-type-safe
@@ -38,6 +40,13 @@
 
 #include <cstring> // required by jsutil.h
 
+// SpiderMonkey wants the DEBUG flag
+#ifndef NDEBUG
+# ifndef DEBUG
+#  define DEBUG
+# endif
+#endif
+
 #include "js/jsapi.h"
 
 #if JS_VERSION != 185

source/tools/atlas/AtlasScript/ScriptInterface.cpp

@@ -344,10 +344,7 @@ template bool ScriptInterface::FromJSVal<wxString>(JSContext*, jsval, wxString&)
 template bool ScriptInterface::FromJSVal<bool>(JSContext*, jsval, bool&);
 template bool ScriptInterface::FromJSVal<float>(JSContext*, jsval, float&);
 template bool ScriptInterface::FromJSVal<CScriptVal>(JSContext*, jsval, CScriptVal&);
-template bool ScriptInterface::FromJSVal<AtlasMessage::sObjectSettings>(JSContext*, jsval, AtlasMessage::sObjectSettings&);
 template jsval ScriptInterface::ToJSVal<wxString>(JSContext*, wxString const&);
-template jsval ScriptInterface::ToJSVal<wxKeyEvent>(JSContext*, wxKeyEvent const&);
-template jsval ScriptInterface::ToJSVal<wxMouseEvent>(JSContext*, wxMouseEvent const&);
 template jsval ScriptInterface::ToJSVal<int>(JSContext*, int const&);
 template jsval ScriptInterface::ToJSVal<float>(JSContext*, float const&);
 template jsval ScriptInterface::ToJSVal<std::vector<int> >(JSContext*, std::vector<int> const&);