diff options
| -rw-r--r-- | doc/classes/TextFile.xml | 13 | ||||
| -rw-r--r-- | drivers/vulkan/SCsub | 4 | ||||
| -rw-r--r-- | editor/doc/doc_data.cpp | 2 | ||||
| -rw-r--r-- | editor/doc/doc_dump.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/text_file.h | 2 |
5 files changed, 6 insertions, 17 deletions
diff --git a/doc/classes/TextFile.xml b/doc/classes/TextFile.xml deleted file mode 100644 index 1c2c2ff25c..0000000000 --- a/doc/classes/TextFile.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<class name="TextFile" inherits="Resource" version="4.0"> - <brief_description> - </brief_description> - <description> - </description> - <tutorials> - </tutorials> - <methods> - </methods> - <constants> - </constants> -</class> diff --git a/drivers/vulkan/SCsub b/drivers/vulkan/SCsub index 8d6eb6b199..2576f68f92 100644 --- a/drivers/vulkan/SCsub +++ b/drivers/vulkan/SCsub @@ -57,6 +57,10 @@ if env['builtin_vulkan']: 'FALLBACK_DATA_DIRS=\\"%s\\"' % '/usr/local/share:/usr/share', 'FALLBACK_CONFIG_DIRS=\\"%s\\"' % '/etc/xdg' ]) + import platform + if (platform.system() == "Linux"): + # In glibc since 2.17 and musl libc since 1.1.24. Used by loader.c. + env_thirdparty.AppendUnique(CPPDEFINES=['HAVE_SECURE_GETENV']) loader_sources = [thirdparty_dir + "/loader/" + file for file in loader_sources] env_thirdparty.add_source_files(env.drivers_sources, loader_sources) diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index c128ca4321..de3d13cdac 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -1032,7 +1032,7 @@ Error DocData::save_classes(const String &p_default_path, const Map<String, Stri String header = "<class name=\"" + c.name + "\""; if (c.inherits != "") header += " inherits=\"" + c.inherits + "\""; - header += String(" version=\"") + VERSION_NUMBER + "\""; + header += String(" version=\"") + VERSION_BRANCH + "\""; header += ">"; _write_string(f, 0, header); diff --git a/editor/doc/doc_dump.cpp b/editor/doc/doc_dump.cpp index d7e1d257f2..5f7fa53ee7 100644 --- a/editor/doc/doc_dump.cpp +++ b/editor/doc/doc_dump.cpp @@ -83,7 +83,7 @@ void DocDump::dump(const String &p_file) { FileAccess *f = FileAccess::open(p_file, FileAccess::WRITE); _write_string(f, 0, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"); - _write_string(f, 0, String("<doc version=\"") + VERSION_NUMBER + "\" name=\"Engine Types\">"); + _write_string(f, 0, String("<doc version=\"") + VERSION_BRANCH + "\" name=\"Engine Types\">"); while (class_list.size()) { diff --git a/scene/resources/text_file.h b/scene/resources/text_file.h index 666c088d04..76c80ba509 100644 --- a/scene/resources/text_file.h +++ b/scene/resources/text_file.h @@ -36,8 +36,6 @@ class TextFile : public Resource { - GDCLASS(TextFile, Resource); - private: String text; String path; |