From eb530b7d943c43ab7d9620f7e6662f083f15c7f2 Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Wed, 7 Jul 2004 10:52:45 +0000 Subject: [PATCH] Use the correct JS lib for Debug/Release. Errors are now also reported through debug_out to reduce the chance of missing them. This was SVN commit r640. --- source/scripting/ScriptingHost.cpp | 8 +++++++- source/scripting/ScriptingHost.h | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/source/scripting/ScriptingHost.cpp b/source/scripting/ScriptingHost.cpp index 962eced810..ef5e110abf 100755 --- a/source/scripting/ScriptingHost.cpp +++ b/source/scripting/ScriptingHost.cpp @@ -14,7 +14,11 @@ # define finite __finite // PT: Need to use _finite in MSVC, __finite in gcc #endif -#pragma comment (lib, "js32.lib") +#ifdef NDEBUG +# pragma comment (lib, "js32.lib") +#else +# pragma comment (lib, "js32d.lib") +#endif extern CConsole* g_Console; @@ -310,6 +314,8 @@ double ScriptingHost::ValueToDouble(const jsval value) void ScriptingHost::ErrorReporter(JSContext * context, const char * message, JSErrorReport * report) { + debug_out("%s(%d) : %s\n", report->filename, report->lineno, message); + if (g_Console) { g_Console->InsertMessage( L"%S ( %d )", report->filename, report->lineno ); diff --git a/source/scripting/ScriptingHost.h b/source/scripting/ScriptingHost.h index 4bd8e24ece..c7b1ce099b 100755 --- a/source/scripting/ScriptingHost.h +++ b/source/scripting/ScriptingHost.h @@ -3,7 +3,7 @@ #define _SCRIPTINGHOST_H_ #ifdef _WIN32 -#define XP_WIN +# define XP_WIN #endif #include @@ -69,8 +69,8 @@ public: JSObject * CreateCustomObject(const std::string & typeName); - void SetObjectProperty(JSObject * object, const std::string & propertyName, jsval value); - jsval GetObjectProperty( JSObject* object, const std::string& propertyName ); + void SetObjectProperty(JSObject * object, const std::string & propertyName, jsval value); + jsval GetObjectProperty(JSObject * object, const std::string & propertyName); void SetGlobal(const std::string& globalName, jsval value); jsval GetGlobal(const std::string& globalName);