From 4a0dc529ce9d1dd35ffa9643351babb1fe0f12dc Mon Sep 17 00:00:00 2001 From: Poommetee Ketson Date: Sun, 25 Jun 2017 19:26:24 +0700 Subject: [PATCH] BuildSystem: generated files have .gen.ext --- .gitignore | 1 + core/SCsub | 6 +++--- core/method_bind.h | 2 +- core/version.h | 2 +- drivers/gles2/rasterizer_gles2.h | 10 +++++----- 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 ++-- methods.py | 20 ++++++++++---------- modules/SCsub | 2 +- platform/android/detect.py | 6 +++--- platform/android/export/export.cpp | 2 +- platform/bb10/export/export.cpp | 2 +- platform/haiku/detect.py | 6 +++--- platform/iphone/detect.py | 6 +++--- platform/javascript/detect.py | 8 ++++---- platform/javascript/export/export.cpp | 2 +- platform/osx/detect.py | 8 ++++---- platform/osx/export/export.cpp | 2 +- platform/windows/detect.py | 8 ++++---- platform/windows/export/export.cpp | 2 +- platform/winrt/detect.py | 8 ++++---- platform/winrt/export/export.cpp | 2 +- platform/x11/detect.py | 8 ++++---- platform/x11/export/export.cpp | 2 +- scene/2d/tile_map.cpp | 2 +- scene/animation/tween.cpp | 2 +- scene/gui/graph_node.cpp | 2 +- scene/resources/surface_tool.cpp | 2 +- servers/visual_server.cpp | 2 +- 35 files changed, 82 insertions(+), 81 deletions(-) diff --git a/.gitignore b/.gitignore index 2dfc6d69441..c69c3ff077e 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/core/SCsub b/core/SCsub index 2d285cdf85e..d4aba346815 100644 --- a/core/SCsub +++ b/core/SCsub @@ -18,7 +18,7 @@ gd_cpp = '#include "globals.h"\n' gd_cpp += gd_inc gd_cpp += "void Globals::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 \"globals.h\"\nuint8_t script_encryption_key[32]={" + txt + "};\n") f.close() @@ -89,7 +89,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 d718a9ba368..e3907006cf9 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -329,6 +329,6 @@ MethodBind *create_native_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 80e50e51b94..43f6f1bbf9f 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/gles2/rasterizer_gles2.h b/drivers/gles2/rasterizer_gles2.h index 9c5a4c487de..265d618703a 100644 --- a/drivers/gles2/rasterizer_gles2.h +++ b/drivers/gles2/rasterizer_gles2.h @@ -53,11 +53,11 @@ #endif #include "drivers/gles2/shader_compiler_gles2.h" -#include "drivers/gles2/shaders/blur.glsl.h" -#include "drivers/gles2/shaders/canvas.glsl.h" -#include "drivers/gles2/shaders/canvas_shadow.glsl.h" -#include "drivers/gles2/shaders/copy.glsl.h" -#include "drivers/gles2/shaders/material.glsl.h" +#include "drivers/gles2/shaders/blur.glsl.gen.h" +#include "drivers/gles2/shaders/canvas.glsl.gen.h" +#include "drivers/gles2/shaders/canvas_shadow.glsl.gen.h" +#include "drivers/gles2/shaders/copy.glsl.gen.h" +#include "drivers/gles2/shaders/material.glsl.gen.h" #include "servers/visual/particle_system_sw.h" /** diff --git a/drivers/unix/SCsub b/drivers/unix/SCsub index 3766e782e41..96efc91b7ae 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 f70bd7111df..730f4aa8925 100644 --- a/editor/SCsub +++ b/editor/SCsub @@ -164,18 +164,18 @@ 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() # API documentation - env.Depends("#editor/doc_data_compressed.h", "#doc/base/classes.xml") - env.Command("#editor/doc_data_compressed.h", "#doc/base/classes.xml", make_doc_header) + env.Depends("#editor/doc_data_compressed.gen.h", "#doc/base/classes.xml") + env.Command("#editor/doc_data_compressed.gen.h", "#doc/base/classes.xml", 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 @@ -183,19 +183,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 59620f18c98..4ad6cb70321 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #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 8e66af23f9e..8e4868b9ede 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #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 f2d7daabb56..2e99bf07481 100644 --- a/editor/editor_initialize_ssl.cpp +++ b/editor/editor_initialize_ssl.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #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 48a628e4583..a77a0037a58 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -33,7 +33,7 @@ #include "version.h" #include "animation_editor.h" -#include "authors.h" +#include "authors.gen.h" #include "bind/core_bind.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 112169b696b..fabce8f9ad2 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -45,7 +45,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 3a24c12f651..bd67e637ccc 100644 --- a/editor/icons/SCsub +++ b/editor/icons/SCsub @@ -88,7 +88,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/methods.py b/methods.py index eb68256c7de..12cc4bfd59d 100755 --- 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") @@ -205,7 +205,7 @@ def build_glsl_header(filename): fd.write("#ifndef " + out_file_ifdef + "\n") fd.write("#define " + out_file_ifdef + "\n") - out_file_class = out_file_base.replace(".glsl.h", "").title().replace("_", "").replace(".", "") + "ShaderGL" + out_file_class = out_file_base.replace(".glsl.gen.h", "").title().replace("_", "").replace(".", "") + "ShaderGL" fd.write("\n\n") fd.write("#include \"drivers/opengl/shader_gl.h\"\n\n\n") fd.write("class " + out_file_class + " : public ShaderGL {\n\n") @@ -485,7 +485,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") @@ -806,7 +806,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 = [] @@ -821,7 +821,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") @@ -1093,7 +1093,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") @@ -1152,7 +1152,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") @@ -1225,7 +1225,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 @@ -1453,7 +1453,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 4b9c08cf789..d1c0cdc05cb 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/detect.py b/platform/android/detect.py index e33fc5618f9..23449ea6bb9 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -256,10 +256,10 @@ def configure(env): import methods env.Append(BUILDERS={'GLSL120': env.Builder( - action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')}) + action=methods.build_legacygl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) env.Append(BUILDERS={'GLSL': env.Builder( - action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')}) + action=methods.build_glsl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) env.Append(BUILDERS={'GLSL120GLES': env.Builder( - action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')}) + action=methods.build_gles2_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) env.use_windows_spawn_fix() diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index a94241ff99e..e39c2d3a314 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 diff --git a/platform/bb10/export/export.cpp b/platform/bb10/export/export.cpp index bd5071969a5..4bd7484cead 100644 --- a/platform/bb10/export/export.cpp +++ b/platform/bb10/export/export.cpp @@ -37,7 +37,7 @@ #include "io/zip_io.h" #include "os/file_access.h" #include "os/os.h" -#include "platform/bb10/logo.h" +#include "platform/bb10/logo.gen.h" #include "version.h" #define MAX_DEVICES 5 diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py index 54e227cd198..e38f06e9d98 100644 --- a/platform/haiku/detect.py +++ b/platform/haiku/detect.py @@ -62,6 +62,6 @@ def configure(env): env.Append(LIBS=['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL']) import methods - env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index af73d3cdba9..6aeaaf4736f 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -183,6 +183,6 @@ def configure(env): env['S_compiler'] = '$IPHONEPATH/Developer/usr/bin/gcc' import methods - env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 89f3fe09163..1742e972252 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -99,7 +99,7 @@ def configure(env): import methods - env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')}) - #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } ) + env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.gen.h',src_suffix = '.hlsl') } ) diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 7d16796e67e..d0fdaf87c14 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -36,7 +36,7 @@ #include "io/zip_io.h" #include "os/file_access.h" #include "os/os.h" -#include "platform/javascript/logo.h" +#include "platform/javascript/logo.gen.h" #include "string.h" #include "version.h" class EditorExportPlatformJavaScript : public EditorExportPlatform { diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 2eebb1da418..2dc0eb28082 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -94,9 +94,9 @@ def configure(env): import methods - env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')}) - #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } ) + env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.gen.h',src_suffix = '.hlsl') } ) env["x86_libtheora_opt_gcc"] = True diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index 6b80453a03c..0af5a9e16f9 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -37,7 +37,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/detect.py b/platform/windows/detect.py index 03d0a68a875..8cfddd4dbef 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -391,7 +391,7 @@ def configure(env): env['is_mingw'] = True env.Append(BUILDERS={'RES': env.Builder(action=build_res_file, suffix='.o', src_suffix='.rc')}) - env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'HLSL9': env.Builder(action=methods.build_hlsl_dx9_headers, suffix='hlsl.h', src_suffix='.hlsl')}) - env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'HLSL9': env.Builder(action=methods.build_hlsl_dx9_headers, suffix='hlsl.gen.h', src_suffix='.hlsl')}) + env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index 85e335469de..7f2a1c7d6ba 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "export.h" #include "editor/editor_import_export.h" -#include "platform/windows/logo.h" +#include "platform/windows/logo.gen.h" void register_windows_exporter() { diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py index 0465bac3753..cfec337deeb 100644 --- a/platform/winrt/detect.py +++ b/platform/winrt/detect.py @@ -163,7 +163,7 @@ def configure(env): env.Append( BUILDERS = { 'ANGLE' : env.Builder(action = angle_build_cmd) } ) - env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) - env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) - env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } ) - env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) + env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.gen.h',src_suffix = '.glsl') } ) + env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.gen.h',src_suffix = '.glsl') } ) + env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.gen.h',src_suffix = '.hlsl') } ) + env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.gen.h',src_suffix = '.glsl') } ) diff --git a/platform/winrt/export/export.cpp b/platform/winrt/export/export.cpp index ee1c6b8d957..a4271af5b02 100644 --- a/platform/winrt/export/export.cpp +++ b/platform/winrt/export/export.cpp @@ -74,7 +74,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "io/zip_io.h" #include "object.h" #include "os/file_access.h" -#include "platform/winrt/logo.h" +#include "platform/winrt/logo.gen.h" #include "thirdparty/minizip/unzip.h" #include "thirdparty/minizip/zip.h" #include "thirdparty/misc/base64.h" diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 4fa943db144..a2171901e99 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -244,10 +244,10 @@ def configure(env): import methods - env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')}) - env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')}) - #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } ) + env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.gen.h', src_suffix='.glsl')}) + #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.gen.h',src_suffix = '.hlsl') } ) if (env["use_static_cpp"] == "yes"): env.Append(LINKFLAGS=['-static-libstdc++']) diff --git a/platform/x11/export/export.cpp b/platform/x11/export/export.cpp index 228923b10c0..6ac9d9c6ac5 100644 --- a/platform/x11/export/export.cpp +++ b/platform/x11/export/export.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "export.h" #include "editor/editor_import_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/tile_map.cpp b/scene/2d/tile_map.cpp index 565ea89f39a..309dfef4647 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/animation/tween.cpp b/scene/animation/tween.cpp index eb70baad4f1..b3f6cbbdfb1 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 d61e33fe61b..ded06303da2 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 0dc67c46275..b67dd70e663 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/servers/visual_server.cpp b/servers/visual_server.cpp index 1797e486eb5..d6065612eb7 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "visual_server.h" #include "globals.h" -#include "method_bind_ext.inc" +#include "method_bind_ext.gen.inc" VisualServer *VisualServer::singleton = NULL; VisualServer *(*VisualServer::create_func)() = NULL;