jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix custom javascript interpreter configuration for OSX.

Browse source
This commit is contained in:
Oliver Buchtala 2014-02-26 22:46:24 +01:00
commit 424e3f4712
7 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Tools/javascript/js_shell.cxx
View file

@ -41,6 +41,7 @@ std::string JSShell::LoadModule(const std::string& name, HANDLE* library) {
std::string lib_name;
std::string module_name;
if (pathIdx == std::string::npos) {
module_name = name;
lib_name = std::string(name).append(LIBRARY_EXT);
@ -50,9 +51,18 @@ std::string JSShell::LoadModule(const std::string& name, HANDLE* library) {
lib_name = path.append(module_name).append(LIBRARY_EXT);
}
HANDLE handle = LOAD_LIBRARY(lib_name.c_str());
std::string lib_path;
HANDLE handle = 0;
for (int i = 0; i < module_path.size(); ++i) {
lib_path = module_path[i] + "/" + lib_name;
if (access( lib_path.c_str(), F_OK ) != -1) {
handle = LOAD_LIBRARY(lib_path.c_str());
}
}
if(handle == 0) {
std::cerr << "Could not load library " << lib_name << ":"
std::cerr << "Could not find module " << lib_path << ":"
<< std::endl << LIBRARY_ERROR() << std::endl;
return 0;
}