godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete the globals.h -> global_config.h conversion

This commit is contained in:
Bojidar Marinov 2017-02-23 17:47:25 +02:00
parent d0973e645c
commit 53921faa91
No known key found for this signature in database
GPG Key ID: 4D546A8F1E091856
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/godot_android.cpp
View File

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

2
platform/haiku/audio_driver_media_kit.cpp
View File

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

2
platform/iphone/rasterizer_iphone.cpp
View File

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

2
platform/uwp/export/export.cpp
View File

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

2
scene/io/resource_format_image.cpp
View File

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

2
tools/editor/editor_export.cpp
View File

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

2
tools/editor/io_plugins/editor_export_scene.cpp
View File

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

2
tools/editor/io_plugins/editor_scene_import_plugin.cpp
View File

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

2
tools/editor/io_plugins/editor_texture_import_plugin.cpp
View File

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

2
tools/editor/plugins/sample_editor_plugin.cpp
View File

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

2
tools/editor/plugins/sample_library_editor_plugin.cpp
View File

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