asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

increased maximum number of scripting languages

Browse source
This commit is contained in:
Karroffel 2017-03-08 03:59:12 +01:00
parent 2281942fb3
commit 67f59bc2d9
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/script_language.h
View file

@ -43,7 +43,7 @@ typedef void (*ScriptEditRequestFunction)(const String &p_path);
class ScriptServer {
enum {
MAX_LANGUAGES = 4
MAX_LANGUAGES = 16
};
static ScriptLanguage *_languages[MAX_LANGUAGES];

17
drivers/unix/os_unix.cpp
View file

@ -436,30 +436,31 @@ String OS_Unix::get_locale() const {
return locale;
}
Error OS_Unix::open_dynamic_library(const String p_path, void* &p_library_handle) {
Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle) {
p_library_handle = dlopen(p_path.utf8().get_data(), RTLD_NOW);
if(!p_library_handle) {
if (!p_library_handle) {
ERR_EXPLAIN("Can't open dynamic library: " + p_path + ". Error: " + dlerror());
ERR_FAIL_V(ERR_CANT_OPEN);
}
return OK;
}
Error OS_Unix::close_dynamic_library(void* p_library_handle) {
if(dlclose(p_library_handle)) {
Error OS_Unix::close_dynamic_library(void *p_library_handle) {
if (dlclose(p_library_handle)) {
return FAILED;
}
return OK;
}
Error OS_Unix::get_dynamic_library_symbol_handle(void* p_library_handle, const String p_name, void* &p_symbol_handle) {
char* error;
Error OS_Unix::get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle) {
char *error;
dlerror(); // Clear existing errors
p_symbol_handle = dlsym(p_library_handle, p_name.utf8().get_data());
if ((error = dlerror()) != NULL) {
ERR_EXPLAIN("Can't resolve symbol " + p_name + ". Error: " + dlerror());
error = dlerror();
if (error != NULL) {
ERR_EXPLAIN("Can't resolve symbol " + p_name + ". Error: " + error);
ERR_FAIL_V(ERR_CANT_RESOLVE);
}
return OK;