Changeset 9827 for ps

Timestamp:

07/15/11 15:22:48 (13 years ago)

Author:

philip

Message:

Be a bit more robust to build environment changes.
Reduce some module dependencies.
Clean up some unused instantiations.

Location:

ps/trunk/source

Files:

• lib/external_libraries/enet.h (modified) (1 diff)
• pch/engine/precompiled.h (modified) (1 diff)
• ps/Preprocessor.cpp (modified) (1 diff)
• renderer/Renderer.h (modified) (2 diffs)
• scriptinterface/ScriptTypes.h (modified) (2 diffs)
• tools/atlas/AtlasScript/ScriptInterface.cpp (modified) (1 diff)

ps/trunk/source/lib/external_libraries/enet.h

@@ -40 +40 @@
 #define _WINSOCK2API_   // winsock2.h include guard
 
-#define WIN32
+#ifndef WIN32
+# define WIN32
+#endif
 
 #endif  // OS_WIN

ps/trunk/source/pch/engine/precompiled.h

@@ -28 +28 @@
 //    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>

ps/trunk/source/ps/Preprocessor.cpp

@@ -764 +764 @@
     }
 
-    uint len = oArg.Length;
+    unsigned int len = oArg.Length;
     while (true)
     {

ps/trunk/source/renderer/Renderer.h

@@ -27 +27 @@
 #include "graphics/SColor.h"
 #include "graphics/ShaderProgram.h"
-#include "lib/ogl.h"
 #include "lib/res/handle.h"
 #include "ps/Singleton.h"
@@ -235 +234 @@
 
     // 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.

ps/trunk/source/scriptinterface/ScriptTypes.h

@@ -21 +21 @@
 #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
@@ -39 +41 @@
 #include <cstring> // required by jsutil.h
 
+// SpiderMonkey wants the DEBUG flag
+#ifndef NDEBUG
+# ifndef DEBUG
+#  define DEBUG
+# endif
+#endif
+
 #include "js/jsapi.h"
 

ps/trunk/source/tools/atlas/AtlasScript/ScriptInterface.cpp

@@ -345 +345 @@
 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&);