abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix spidermonkey-tip to build on Windows. Add precompiled binaries.

Browse Source 
This was SVN commit r7365.
This commit is contained in:
Ykkrosh 2010-03-19 20:28:22 +00:00
parent 31febafb05
commit e7e8b8dbc3
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/premake/extern_libs.lua
View File

@ -182,9 +182,14 @@ extern_lib_defs = {
options["with-spidermonkey-tip"] and
{
add_func = function()
tinsert(package.config["Debug" ].includepaths, libraries_dir.."spidermonkey-tip/include/debug")
tinsert(package.config["Testing"].includepaths, libraries_dir.."spidermonkey-tip/include/debug")
tinsert(package.config["Release"].includepaths, libraries_dir.."spidermonkey-tip/include/release")
if OS == "windows" then
include_dir = "include-win32"
else
include_dir = "include-unix"
end
tinsert(package.config["Debug" ].includepaths, libraries_dir.."spidermonkey-tip/"..include_dir.."/debug")
tinsert(package.config["Testing"].includepaths, libraries_dir.."spidermonkey-tip/"..include_dir.."/debug")
tinsert(package.config["Release"].includepaths, libraries_dir.."spidermonkey-tip/"..include_dir.."/release")
tinsert(package.libpaths, libraries_dir.."spidermonkey-tip/lib")
tinsert(package.config["Debug" ].links, "mozjs-ps-debug")
tinsert(package.config["Testing"].links, "mozjs-ps-release")

2
source/i18n/ScriptInterface.h
View File

@ -35,7 +35,7 @@ and 'variables' (dependent on the type passed with "translate(...) <<").
ERROR_SUBGROUP(I18n, Script);
ERROR_TYPE(I18n_Script, SetupFailed);
typedef _W64 long JSWord;
typedef intptr_t JSWord;
typedef JSWord jsword;
typedef jsword jsval;
typedef unsigned short jschar;

9
source/scripting/ScriptingHost.cpp
View File

@ -26,15 +26,6 @@
#include "ps/Filesystem.h"
#include "scriptinterface/ScriptInterface.h"
#if OS_WIN
#ifdef NDEBUG
# pragma comment (lib, "js32.lib")
#else
# pragma comment (lib, "js32d.lib")
#endif
#endif
#define LOG_CATEGORY L"scriptinghost"
namespace