Merge pull request #7879 from bojidar-bg/fix-iphone-builds

Complete the globals.h -> global_config.h conversion

platform/android/godot_android.cpp

@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include "os_android.h"
-#include "globals.h"
+#include "global_config.h"
 #include "main/main.h"
 #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "godot", __VA_ARGS__))
 #define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "godot", __VA_ARGS__))

platform/haiku/audio_driver_media_kit.cpp

@@ -30,7 +30,7 @@
 
 #ifdef MEDIA_KIT_ENABLED
 
-#include "globals.h"
+#include "global_config.h"
 
 int32_t* AudioDriverMediaKit::samples_in = NULL;
 

platform/iphone/rasterizer_iphone.cpp

@@ -30,7 +30,7 @@
 
 #include "rasterizer_iphone.h"
 #include "os/os.h"
-#include "globals.h"
+#include "global_config.h"
 #include <stdio.h>
 
 _FORCE_INLINE_ static void _gl_load_transform(const Transform& tr) {

platform/uwp/export/export.cpp

@@ -79,7 +79,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "io/sha256.h"
 #include "io/base64.h"
 #include "bind/core_bind.h"
-#include "globals.h"
+#include "global_config.h"
 #include "io/marshalls.h"
 
 #include <zlib.h>

scene/io/resource_format_image.cpp

@@ -31,7 +31,7 @@
 #if 0
 #include "scene/resources/texture.h"
 #include "io/image_loader.h"
-#include "globals.h"
+#include "global_config.h"
 #include "os/os.h"
 RES ResourceFormatLoaderImage::load(const String &p_path, const String& p_original_path, Error *r_error) {
 

tools/editor/editor_export.cpp

@@ -956,7 +956,7 @@ EditorExportPlatformPC::EditorExportPlatformPC() {
 #if 0
 #include "version.h"
 #include "script_language.h"
-#include "globals.h"
+#include "global_config.h"
 #include "os/file_access.h"
 #include "os/dir_access.h"
 #include "tools/editor/editor_file_system.h"

tools/editor/io_plugins/editor_export_scene.cpp

@@ -34,7 +34,7 @@
 #include "os/file_access.h"
 #include "tools/editor/editor_settings.h"
 #include "scene/resources/packed_scene.h"
-#include "globals.h"
+#include "global_config.h"
 
 Vector<uint8_t> EditorSceneExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
 

tools/editor/io_plugins/editor_scene_import_plugin.cpp

@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "editor_scene_import_plugin.h"
 #if 0
-#include "globals.h"
+#include "global_config.h"
 #include "tools/editor/editor_node.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/box_shape.h"

tools/editor/io_plugins/editor_texture_import_plugin.cpp

@@ -35,7 +35,7 @@
 #include "tools/editor/editor_settings.h"
 #include "io/md5.h"
 #include "io/marshalls.h"
-#include "globals.h"
+#include "global_config.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/button_group.h"
 #include "scene/gui/margin_container.h"

tools/editor/plugins/sample_editor_plugin.cpp

@@ -30,7 +30,7 @@
 
 #if 0
 #include "io/resource_loader.h"
-#include "globals.h"
+#include "global_config.h"
 #include "tools/editor/editor_settings.h"
 
 

tools/editor/plugins/sample_library_editor_plugin.cpp

@@ -31,7 +31,7 @@
 #include "sample_library_editor_plugin.h"
 
 #include "io/resource_loader.h"
-#include "globals.h"
+#include "global_config.h"
 #include "tools/editor/editor_settings.h"
 #include "scene/main/viewport.h"
 #include "sample_editor_plugin.h"