diff options
| -rw-r--r-- | core/os/input_event.h | 4 | ||||
| -rw-r--r-- | methods.py | 20 | ||||
| -rw-r--r-- | modules/SCsub | 2 | ||||
| -rw-r--r-- | servers/visual_server.cpp | 2 |
4 files changed, 17 insertions, 11 deletions
diff --git a/core/os/input_event.h b/core/os/input_event.h index 72057659d2..ad754d0d1f 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -110,8 +110,8 @@ enum JoystickList { JOY_WII_C = JOY_BUTTON_5, JOY_WII_Z = JOY_BUTTON_6, - JOY_WII_MINUS = JOY_BUTTON_9, - JOY_WII_PLUS = JOY_BUTTON_10, + JOY_WII_MINUS = JOY_BUTTON_10, + JOY_WII_PLUS = JOY_BUTTON_11, // end of history diff --git a/methods.py b/methods.py index a8f1fb8a5d..f4d33fb6d8 100644 --- a/methods.py +++ b/methods.py @@ -1477,7 +1477,7 @@ def use_windows_spawn_fix(self, platform=None): self['SPAWN'] = mySpawn -def split_lib(self, libname): +def split_lib(self, libname, src_list = None, env_lib = None): import string env = self @@ -1487,7 +1487,13 @@ def split_lib(self, libname): list = [] lib_list = [] - for f in getattr(env, libname + "_sources"): + if src_list == None: + src_list = getattr(env, libname + "_sources") + + if type(env_lib) == type(None): + env_lib = env + + for f in src_list: fname = "" if type(f) == type(""): fname = env.File(f).path @@ -1497,26 +1503,26 @@ def split_lib(self, libname): base = string.join(fname.split("/")[:2], "/") if base != cur_base and len(list) > max_src: if num > 0: - lib = env.add_library(libname + str(num), list) + lib = env_lib.add_library(libname + str(num), list) lib_list.append(lib) list = [] num = num + 1 cur_base = base list.append(f) - lib = env.add_library(libname + str(num), list) + lib = env_lib.add_library(libname + str(num), list) lib_list.append(lib) if len(lib_list) > 0: import os, sys if os.name == 'posix' and sys.platform == 'msys': env.Replace(ARFLAGS=['rcsT']) - lib = env.add_library(libname + "_collated", lib_list) + lib = env_lib.add_library(libname + "_collated", lib_list) lib_list = [lib] lib_base = [] - env.add_source_files(lib_base, "*.cpp") - lib = env.add_library(libname, lib_base) + env_lib.add_source_files(lib_base, "*.cpp") + lib = env_lib.add_library(libname, lib_base) lib_list.insert(0, lib) env.Prepend(LIBS=lib_list) diff --git a/modules/SCsub b/modules/SCsub index 7a467676cd..74a5267355 100644 --- a/modules/SCsub +++ b/modules/SCsub @@ -18,7 +18,7 @@ for x in env.module_list: SConscript(x + "/SCsub") if env.split_modules: - env.split_lib("modules") + env.split_lib("modules", env_lib = env_modules) else: lib = env_modules.add_library("modules", env.modules_sources) diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index faa8c50837..663fce85e9 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -1656,7 +1656,7 @@ void VisualServer::_bind_methods() { ClassDB::bind_method(D_METHOD("black_bars_set_margins", "left", "top", "right", "bottom"), &VisualServer::black_bars_set_margins); ClassDB::bind_method(D_METHOD("black_bars_set_images", "left", "top", "right", "bottom"), &VisualServer::black_bars_set_images); - ClassDB::bind_method(D_METHOD("free", "rid"), &VisualServer::free); + ClassDB::bind_method(D_METHOD("free_rid", "rid"), &VisualServer::free); // shouldn't conflict with Object::free() ClassDB::bind_method(D_METHOD("request_frame_drawn_callback", "where", "method", "userdata"), &VisualServer::request_frame_drawn_callback); ClassDB::bind_method(D_METHOD("draw", "swap_buffers"), &VisualServer::draw, DEFVAL(true)); |