From e3998528e021d2722b40bc1bcda809baaa2cce3b Mon Sep 17 00:00:00 2001 From: Poommetee Ketson Date: Fri, 23 Jun 2017 22:03:41 +0700 Subject: [PATCH] BuildSystem: generated files have .gen.extension --- .gitignore | 1 + SConstruct | 2 +- core/SCsub | 6 ++-- core/method_bind.h | 2 +- core/version.h | 2 +- drivers/gles3/SCsub | 2 ++ drivers/gles3/rasterizer_canvas_gles3.h | 2 +- drivers/gles3/rasterizer_scene_gles3.h | 22 +++++++------- drivers/gles3/rasterizer_storage_gles3.h | 10 +++---- drivers/gles3/shaders/SCsub | 38 ++++++++++++------------ drivers/unix/SCsub | 2 +- editor/SCsub | 22 +++++++------- editor/editor_fonts.cpp | 2 +- editor/editor_help.cpp | 2 +- editor/editor_initialize_ssl.cpp | 2 +- editor/editor_node.cpp | 2 +- editor/editor_settings.cpp | 2 +- editor/icons/SCsub | 4 +-- main/SCsub | 8 ++--- main/main.cpp | 4 +-- methods.py | 18 +++++------ modules/SCsub | 2 +- platform/android/export/export.cpp | 2 +- platform/javascript/export/export.cpp | 2 +- platform/osx/export/export.cpp | 2 +- platform/windows/export/export.cpp | 2 +- platform/x11/export/export.cpp | 2 +- scene/2d/canvas_item.cpp | 2 +- scene/2d/tile_map.cpp | 2 +- scene/3d/physics_body.cpp | 2 +- scene/animation/tween.cpp | 2 +- scene/gui/graph_node.cpp | 2 +- scene/resources/surface_tool.cpp | 2 +- scene/resources/texture.cpp | 2 +- servers/visual_server.cpp | 2 +- 35 files changed, 93 insertions(+), 90 deletions(-) diff --git a/.gitignore b/.gitignore index 84aaefd736..4ba0e7963f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # Godot auto generated files +*.gen.* core/global_defaults.cpp core/method_bind_ext.inc core/method_bind.inc diff --git a/SConstruct b/SConstruct index 11cd95464d..e745d7bb15 100644 --- a/SConstruct +++ b/SConstruct @@ -377,7 +377,7 @@ if selected_platform in platform_list: methods.no_verbose(sys, env) if (True): # FIXME: detect GLES3 - env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) + env.Append( BUILDERS = { 'GLES3_GLSL' : env.Builder(action = methods.build_gles3_headers, suffix = 'glsl.gen.h',src_suffix = '.glsl') } ) Export('env') diff --git a/core/SCsub b/core/SCsub index da2403f1d3..02abaa2bb6 100644 --- a/core/SCsub +++ b/core/SCsub @@ -18,7 +18,7 @@ gd_cpp = '#include "global_config.h"\n' gd_cpp += gd_inc gd_cpp += "void GlobalConfig::register_global_defaults() {\n" + gd_call + "\n}\n" -f = open("global_defaults.cpp", "wb") +f = open("global_defaults.gen.cpp", "wb") f.write(gd_cpp) f.close() @@ -47,7 +47,7 @@ if ("SCRIPT_AES256_ENCRYPTION_KEY" in os.environ): txt = "0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0" print("Invalid AES256 encryption key, not 64 bits hex: " + e) -f = open("script_encryption_key.cpp", "wb") +f = open("script_encryption_key.gen.cpp", "wb") f.write("#include \"global_config.h\"\nuint8_t script_encryption_key[32]={" + txt + "};\n") f.close() @@ -109,7 +109,7 @@ env.add_source_files(env.core_sources, "*.cpp") # Make binders import make_binders -env.Command(['method_bind.inc', 'method_bind_ext.inc'], 'make_binders.py', make_binders.run) +env.Command(['method_bind.gen.inc', 'method_bind_ext.gen.inc'], 'make_binders.py', make_binders.run) # Chain load SCsubs diff --git a/core/method_bind.h b/core/method_bind.h index 8d72c8573a..dbc9cca082 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -343,6 +343,6 @@ MethodBind *create_vararg_method_bind(Variant (T::*p_method)(const Variant **, i // if you declare an nonexistent class.. class __UnexistingClass; -#include "method_bind.inc" +#include "method_bind.gen.inc" #endif diff --git a/core/version.h b/core/version.h index 80e50e51b9..43f6f1bbf9 100644 --- a/core/version.h +++ b/core/version.h @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "version_generated.h" +#include "version_generated.gen.h" #ifdef VERSION_PATCH #define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) diff --git a/drivers/gles3/SCsub b/drivers/gles3/SCsub index a17335b41b..2471dd3739 100644 --- a/drivers/gles3/SCsub +++ b/drivers/gles3/SCsub @@ -1,3 +1,5 @@ +#!/usr/bin/env python + Import('env') env.add_source_files(env.drivers_sources,"*.cpp") diff --git a/drivers/gles3/rasterizer_canvas_gles3.h b/drivers/gles3/rasterizer_canvas_gles3.h index 5f435275df..5859820364 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.h +++ b/drivers/gles3/rasterizer_canvas_gles3.h @@ -32,7 +32,7 @@ #include "rasterizer_storage_gles3.h" #include "servers/visual/rasterizer.h" -#include "shaders/canvas_shadow.glsl.h" +#include "shaders/canvas_shadow.glsl.gen.h" class RasterizerCanvasGLES3 : public RasterizerCanvas { public: diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h index c52a00bf17..5f0db446a9 100644 --- a/drivers/gles3/rasterizer_scene_gles3.h +++ b/drivers/gles3/rasterizer_scene_gles3.h @@ -33,17 +33,17 @@ /* Must come before shaders or the Windows build fails... */ #include "rasterizer_storage_gles3.h" -#include "drivers/gles3/shaders/cube_to_dp.glsl.h" -#include "drivers/gles3/shaders/effect_blur.glsl.h" -#include "drivers/gles3/shaders/exposure.glsl.h" -#include "drivers/gles3/shaders/resolve.glsl.h" -#include "drivers/gles3/shaders/scene.glsl.h" -#include "drivers/gles3/shaders/screen_space_reflection.glsl.h" -#include "drivers/gles3/shaders/ssao.glsl.h" -#include "drivers/gles3/shaders/ssao_blur.glsl.h" -#include "drivers/gles3/shaders/ssao_minify.glsl.h" -#include "drivers/gles3/shaders/subsurf_scattering.glsl.h" -#include "drivers/gles3/shaders/tonemap.glsl.h" +#include "drivers/gles3/shaders/cube_to_dp.glsl.gen.h" +#include "drivers/gles3/shaders/effect_blur.glsl.gen.h" +#include "drivers/gles3/shaders/exposure.glsl.gen.h" +#include "drivers/gles3/shaders/resolve.glsl.gen.h" +#include "drivers/gles3/shaders/scene.glsl.gen.h" +#include "drivers/gles3/shaders/screen_space_reflection.glsl.gen.h" +#include "drivers/gles3/shaders/ssao.glsl.gen.h" +#include "drivers/gles3/shaders/ssao_blur.glsl.gen.h" +#include "drivers/gles3/shaders/ssao_minify.glsl.gen.h" +#include "drivers/gles3/shaders/subsurf_scattering.glsl.gen.h" +#include "drivers/gles3/shaders/tonemap.glsl.gen.h" class RasterizerSceneGLES3 : public RasterizerScene { public: diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index 65026a16ec..79abebae5b 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -35,11 +35,11 @@ #include "servers/visual/shader_language.h" #include "shader_compiler_gles3.h" #include "shader_gles3.h" -#include "shaders/blend_shape.glsl.h" -#include "shaders/canvas.glsl.h" -#include "shaders/copy.glsl.h" -#include "shaders/cubemap_filter.glsl.h" -#include "shaders/particles.glsl.h" +#include "shaders/blend_shape.glsl.gen.h" +#include "shaders/canvas.glsl.gen.h" +#include "shaders/copy.glsl.gen.h" +#include "shaders/cubemap_filter.glsl.gen.h" +#include "shaders/particles.glsl.gen.h" class RasterizerCanvasGLES3; class RasterizerSceneGLES3; diff --git a/drivers/gles3/shaders/SCsub b/drivers/gles3/shaders/SCsub index f9baeae97d..0c69c8cf74 100644 --- a/drivers/gles3/shaders/SCsub +++ b/drivers/gles3/shaders/SCsub @@ -1,22 +1,22 @@ +#!/usr/bin/env python + Import('env') if env['BUILDERS'].has_key('GLES3_GLSL'): - env.GLES3_GLSL('copy.glsl'); - env.GLES3_GLSL('resolve.glsl'); - env.GLES3_GLSL('canvas.glsl'); - env.GLES3_GLSL('canvas_shadow.glsl'); - env.GLES3_GLSL('scene.glsl'); - env.GLES3_GLSL('cubemap_filter.glsl'); - env.GLES3_GLSL('cube_to_dp.glsl'); - env.GLES3_GLSL('blend_shape.glsl'); - env.GLES3_GLSL('screen_space_reflection.glsl'); - env.GLES3_GLSL('effect_blur.glsl'); - env.GLES3_GLSL('subsurf_scattering.glsl'); - env.GLES3_GLSL('ssao.glsl'); - env.GLES3_GLSL('ssao_minify.glsl'); - env.GLES3_GLSL('ssao_blur.glsl'); - env.GLES3_GLSL('exposure.glsl'); - env.GLES3_GLSL('tonemap.glsl'); - env.GLES3_GLSL('particles.glsl'); - - + env.GLES3_GLSL('copy.glsl'); + env.GLES3_GLSL('resolve.glsl'); + env.GLES3_GLSL('canvas.glsl'); + env.GLES3_GLSL('canvas_shadow.glsl'); + env.GLES3_GLSL('scene.glsl'); + env.GLES3_GLSL('cubemap_filter.glsl'); + env.GLES3_GLSL('cube_to_dp.glsl'); + env.GLES3_GLSL('blend_shape.glsl'); + env.GLES3_GLSL('screen_space_reflection.glsl'); + env.GLES3_GLSL('effect_blur.glsl'); + env.GLES3_GLSL('subsurf_scattering.glsl'); + env.GLES3_GLSL('ssao.glsl'); + env.GLES3_GLSL('ssao_minify.glsl'); + env.GLES3_GLSL('ssao_blur.glsl'); + env.GLES3_GLSL('exposure.glsl'); + env.GLES3_GLSL('tonemap.glsl'); + env.GLES3_GLSL('particles.glsl'); diff --git a/drivers/unix/SCsub b/drivers/unix/SCsub index 3766e782e4..96efc91b7a 100644 --- a/drivers/unix/SCsub +++ b/drivers/unix/SCsub @@ -8,7 +8,7 @@ g_set_p += 'String OS_Unix::get_global_settings_path() const {\n' g_set_p += '\treturn "' + env["unix_global_settings_path"] + '";\n' g_set_p += '}\n' g_set_p += '#endif' -f = open("os_unix_global_settings_path.cpp", "wb") +f = open("os_unix_global_settings_path.gen.cpp", "wb") f.write(g_set_p) f.close() diff --git a/editor/SCsub b/editor/SCsub index c46e443534..ffdeed1523 100644 --- a/editor/SCsub +++ b/editor/SCsub @@ -176,7 +176,7 @@ if (env["tools"] == "yes"): reg_exporters += '\tregister_' + e + '_exporter();\n' reg_exporters_inc += '#include "platform/' + e + '/export/export.h"\n' reg_exporters += '}\n' - f = open("register_exporters.cpp", "wb") + f = open("register_exporters.gen.cpp", "wb") f.write(reg_exporters_inc) f.write(reg_exporters) f.close() @@ -189,12 +189,12 @@ if (env["tools"] == "yes"): docfile = os.path.join(curmodle, "classes.xml") if os.path.isdir(curmodle) and os.path.isfile(docfile): docs.append(docfile) - env.Depends("#editor/doc_data_compressed.h", docs) - env.Command("#editor/doc_data_compressed.h", docs, make_doc_header) + env.Depends("#editor/doc_data_compressed.gen.h", docs) + env.Command("#editor/doc_data_compressed.gen.h", docs, make_doc_header) # Certificates - env.Depends("#editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt") - env.Command("#editor/certs_compressed.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header) + env.Depends("#editor/certs_compressed.gen.h", "#thirdparty/certs/ca-certificates.crt") + env.Command("#editor/certs_compressed.gen.h", "#thirdparty/certs/ca-certificates.crt", make_certs_header) import glob path = env.Dir('.').abspath @@ -202,19 +202,19 @@ if (env["tools"] == "yes"): # Translations tlist = glob.glob(path + "/translations/*.po") print("translations: ", tlist) - env.Depends('#editor/translations.h', tlist) - env.Command('#editor/translations.h', tlist, make_translations_header) + env.Depends('#editor/translations.gen.h', tlist) + env.Command('#editor/translations.gen.h', tlist, make_translations_header) # Fonts flist = glob.glob(path + "/../thirdparty/fonts/*.ttf") flist.append(glob.glob(path + "/../thirdparty/fonts/*.otf")) print("fonts: ", flist) - env.Depends('#editor/builtin_fonts.h', flist) - env.Command('#editor/builtin_fonts.h', flist, make_fonts_header) + env.Depends('#editor/builtin_fonts.gen.h', flist) + env.Command('#editor/builtin_fonts.gen.h', flist, make_fonts_header) # Authors - env.Depends('#editor/authors.h', "../AUTHORS.md") - env.Command('#editor/authors.h', "../AUTHORS.md", make_authors_header) + env.Depends('#editor/authors.gen.h', "../AUTHORS.md") + env.Command('#editor/authors.gen.h', "../AUTHORS.md", make_authors_header) env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 0873b90f22..4a85b4e2ef 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "editor_fonts.h" -#include "builtin_fonts.h" +#include "builtin_fonts.gen.h" #include "doc_code_font.h" #include "doc_font.h" #include "doc_title_font.h" diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 11cb61370d..5089468e1d 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "editor_help.h" -#include "doc_data_compressed.h" +#include "doc_data_compressed.gen.h" #include "editor/plugins/script_editor_plugin.h" #include "editor_node.h" #include "editor_settings.h" diff --git a/editor/editor_initialize_ssl.cpp b/editor/editor_initialize_ssl.cpp index 23a033f6fb..290ade277e 100644 --- a/editor/editor_initialize_ssl.cpp +++ b/editor/editor_initialize_ssl.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "editor_initialize_ssl.h" -#include "certs_compressed.h" +#include "certs_compressed.gen.h" #include "io/compression.h" #include "io/stream_peer_ssl.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 04257b8cd1..097c2977e8 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -30,7 +30,7 @@ #include "editor_node.h" #include "animation_editor.h" -#include "authors.h" +#include "authors.gen.h" #include "bind/core_bind.h" #include "class_db.h" #include "core/io/resource_loader.h" diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 485f8236de..77f8c59b95 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -44,7 +44,7 @@ #include "scene/main/node.h" #include "scene/main/scene_main_loop.h" #include "scene/main/viewport.h" -#include "translations.h" +#include "translations.gen.h" #include "version.h" Ref EditorSettings::singleton = NULL; diff --git a/editor/icons/SCsub b/editor/icons/SCsub index 20a381cc78..182624a80d 100644 --- a/editor/icons/SCsub +++ b/editor/icons/SCsub @@ -90,7 +90,7 @@ make_editor_icons_builder = Builder(action=make_editor_icons_action, suffix='.cpp', src_suffix='.png') env['BUILDERS']['MakeEditorIconsBuilder'] = make_editor_icons_builder -env.Alias('editor_icons', [env.MakeEditorIconsBuilder('#editor/editor_icons.cpp', Glob("*.png"))]) +env.Alias('editor_icons', [env.MakeEditorIconsBuilder('#editor/editor_icons.gen.cpp', Glob("*.png"))]) -env.editor_sources.append("#editor/editor_icons.cpp") +env.editor_sources.append("#editor/editor_icons.gen.cpp") Export('env') diff --git a/main/SCsub b/main/SCsub index 56dfbaa0f1..1675a6e6ab 100644 --- a/main/SCsub +++ b/main/SCsub @@ -47,11 +47,11 @@ env.add_source_files(env.main_sources, "*.cpp") Export('env') -env.Depends("#main/splash.h", "#main/splash.png") -env.Command("#main/splash.h", "#main/splash.png", make_splash) +env.Depends("#main/splash.gen.h", "#main/splash.png") +env.Command("#main/splash.gen.h", "#main/splash.png", make_splash) -env.Depends("#main/app_icon.h", "#main/app_icon.png") -env.Command("#main/app_icon.h", "#main/app_icon.png", make_app_icon) +env.Depends("#main/app_icon.gen.h", "#main/app_icon.png") +env.Command("#main/app_icon.gen.h", "#main/app_icon.png", make_app_icon) SConscript('tests/SCsub') diff --git a/main/main.cpp b/main/main.cpp index e00c136596..cd464de1aa 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "main.h" -#include "app_icon.h" +#include "app_icon.gen.h" #include "core/register_core_types.h" #include "drivers/register_driver_types.h" #include "global_config.h" @@ -39,7 +39,7 @@ #include "script_debugger_local.h" #include "script_debugger_remote.h" #include "servers/register_server_types.h" -#include "splash.h" +#include "splash.gen.h" #include "input_map.h" #include "io/resource_loader.h" diff --git a/methods.py b/methods.py index 5af6c6aed0..2f9d45897e 100644 --- a/methods.py +++ b/methods.py @@ -29,7 +29,7 @@ def build_shader_header(target, source, env): name = name.replace(".", "_") fs = open(str(x), "r") - fd = open(str(x) + ".h", "w") + fd = open(str(x) + ".gen.h", "w") fd.write("/* this file has been generated by SCons, do not edit! */\n") fd.write("static const char *" + name + "=\n") line = fs.readline() @@ -192,7 +192,7 @@ def build_glsl_header(filename): fs.close() - out_file = filename + ".h" + out_file = filename + ".gen.h" fd = open(out_file, "w") fd.write("/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */\n") @@ -486,7 +486,7 @@ def build_hlsl_dx9_header(filename): fs.close() - out_file = filename + ".h" + out_file = filename + ".gen.h" fd = open(out_file, "w") fd.write("/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */\n") @@ -843,7 +843,7 @@ def build_legacygl_header(filename, include, class_suffix, output_attribs): header_data = LegacyGLHeaderStruct() include_file_in_legacygl_header(filename, header_data, 0) - out_file = filename + ".h" + out_file = filename + ".gen.h" fd = open(out_file, "w") enum_constants = [] @@ -858,7 +858,7 @@ def build_legacygl_header(filename, include, class_suffix, output_attribs): fd.write("#ifndef " + out_file_ifdef + class_suffix + "_120\n") fd.write("#define " + out_file_ifdef + class_suffix + "_120\n") - out_file_class = out_file_base.replace(".glsl.h", "").title().replace("_", "").replace(".", "") + "Shader" + class_suffix + out_file_class = out_file_base.replace(".glsl.gen.h", "").title().replace("_", "").replace(".", "") + "Shader" + class_suffix fd.write("\n\n") fd.write("#include \"" + include + "\"\n\n\n") fd.write("class " + out_file_class + " : public Shader" + class_suffix + " {\n\n") @@ -1165,7 +1165,7 @@ def update_version(): print("Using custom revision: " + rev) import version - f = open("core/version_generated.h", "wb") + f = open("core/version_generated.gen.h", "wb") f.write("#define VERSION_SHORT_NAME " + str(version.short_name) + "\n") f.write("#define VERSION_NAME " + str(version.name) + "\n") f.write("#define VERSION_MAJOR " + str(version.major) + "\n") @@ -1224,7 +1224,7 @@ def build_cg_shader(sname): parse_cg_file("fp_" + sname + ".cg", fp_uniforms, fp_uniform_sizes, fp_conditionals) - fd = open("shader_" + sname + ".cg.h", "w") + fd = open("shader_" + sname + ".cg.gen.h", "w") fd.write('\n#include "shader_cell.h"\n') fd.write("\nclass Shader_" + sname + " : public ShaderCell {\n") @@ -1299,7 +1299,7 @@ void unregister_module_types() { """ - f = open("modules/register_module_types.cpp", "wb") + f = open("modules/register_module_types.gen.cpp", "wb") f.write(modules_cpp) return module_list @@ -1527,7 +1527,7 @@ def save_active_platforms(apnames, ap): str += "};\n" - wf = x + "/logo.h" + wf = x + "/logo.gen.h" logow = open(wf, "wb") logow.write(str) diff --git a/modules/SCsub b/modules/SCsub index 4b9c08cf78..d1c0cdc05c 100644 --- a/modules/SCsub +++ b/modules/SCsub @@ -7,7 +7,7 @@ env_modules = env.Clone() Export('env_modules') env.modules_sources = [ - "register_module_types.cpp", + "register_module_types.gen.cpp", ] # env.add_source_files(env.modules_sources,"*.cpp") Export('env') diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 51597526ab..d6ed234669 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -36,7 +36,7 @@ #include "io/zip_io.h" #include "os/file_access.h" #include "os/os.h" -#include "platform/android/logo.h" +#include "platform/android/logo.gen.h" #include "version.h" #include #if 0 diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index ea388072c5..8b04deabd7 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -30,7 +30,7 @@ #include "editor/editor_node.h" #include "editor_export.h" #include "io/zip_io.h" -#include "platform/javascript/logo.h" +#include "platform/javascript/logo.gen.h" #define EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE "webassembly_release.zip" #define EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG "webassembly_debug.zip" diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index 474d286405..066adde780 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -38,7 +38,7 @@ #include "io/zip_io.h" #include "os/file_access.h" #include "os/os.h" -#include "platform/osx/logo.h" +#include "platform/osx/logo.gen.h" #include "string.h" #include "version.h" diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index 3802e7e784..c9271f6266 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "editor/editor_export.h" -#include "platform/windows/logo.h" +#include "platform/windows/logo.gen.h" void register_windows_exporter() { diff --git a/platform/x11/export/export.cpp b/platform/x11/export/export.cpp index d6bad95e5b..69784a473d 100644 --- a/platform/x11/export/export.cpp +++ b/platform/x11/export/export.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "export.h" #include "editor/editor_export.h" -#include "platform/x11/logo.h" +#include "platform/x11/logo.gen.h" #include "scene/resources/texture.h" void register_x11_exporter() { diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 189dd66a26..57d178abe3 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "canvas_item.h" -#include "core/method_bind_ext.inc" +#include "core/method_bind_ext.gen.inc" #include "message_queue.h" #include "os/input.h" #include "scene/main/canvas_layer.h" diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 4f892a31fc..7ffe029231 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "tile_map.h" #include "io/marshalls.h" -#include "method_bind_ext.inc" +#include "method_bind_ext.gen.inc" #include "os/os.h" #include "servers/physics_2d_server.h" diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 3a55a2bc32..2a7a804470 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "physics_body.h" -#include "method_bind_ext.inc" +#include "method_bind_ext.gen.inc" #include "scene/scene_string_names.h" void PhysicsBody::_notification(int p_what) { diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index 67920d177e..ad0b0fbfb2 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "tween.h" -#include "method_bind_ext.inc" +#include "method_bind_ext.gen.inc" void Tween::_add_pending_command(StringName p_key, const Variant &p_arg1, const Variant &p_arg2, const Variant &p_arg3, const Variant &p_arg4, const Variant &p_arg5, const Variant &p_arg6, const Variant &p_arg7, const Variant &p_arg8, const Variant &p_arg9, const Variant &p_arg10) { diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp index 95f65f31d6..538dd846e4 100644 --- a/scene/gui/graph_node.cpp +++ b/scene/gui/graph_node.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "graph_node.h" -#include "method_bind_ext.inc" +#include "method_bind_ext.gen.inc" bool GraphNode::_set(const StringName &p_name, const Variant &p_value) { diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index 60fb97c792..b2822ca0c4 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "surface_tool.h" -#include "method_bind_ext.inc" +#include "method_bind_ext.gen.inc" #define _VERTEX_SNAP 0.0001 #define EQ_VERTEX_DIST 0.00001 diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 5049c0a1d6..0bd8c41228 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "texture.h" -#include "core/method_bind_ext.inc" +#include "core/method_bind_ext.gen.inc" #include "core/os/os.h" #include "core_string_names.h" #include "io/image_loader.h" diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index c3ae58cf4f..eb0848ff50 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "visual_server.h" #include "global_config.h" -#include "method_bind_ext.inc" +#include "method_bind_ext.gen.inc" VisualServer *VisualServer::singleton = NULL; VisualServer *(*VisualServer::create_func)() = NULL;