Merge pull request #9364 from Noshyaar/pr-genh21

BuildSystem: generated files have .gen.ext (2.1)

.gitignore

@@ -1,4 +1,5 @@
 # Godot auto generated files
+*.gen.*
 core/global_defaults.cpp
 core/method_bind_ext.inc
 core/method_bind.inc

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

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

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)

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"
 
 /**

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()
 

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")

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"

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"

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"
 

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"

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> EditorSettings::singleton = NULL;

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')

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)
 

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')

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()

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 <string.h>
 

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

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')})

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')})

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') } )

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 {

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

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"
 

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')})

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() {
 

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') } )

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"

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++'])

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() {

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"
 

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) {
 

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) {
 

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

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;