diff options
| author | Juan Linietsky | 2017-02-21 00:05:15 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-02-21 00:06:30 -0300 |
| commit | de0045cf1b0a5e20fbf74da192039d344ee8d0c7 (patch) | |
| tree | 2581bd8995461f1c3d9245f336fd88175b52770e /platform/android | |
| parent | 6e2bf31e5a8f3dbe18e31b1aff9c26ee184ad8c8 (diff) | |
| download | godot-de0045cf1b0a5e20fbf74da192039d344ee8d0c7.tar.gz godot-de0045cf1b0a5e20fbf74da192039d344ee8d0c7.tar.zst godot-de0045cf1b0a5e20fbf74da192039d344ee8d0c7.zip | |
-renamed globals.h to global_config.cpp (this seems to have caused a few modified files)
-.pck and .zip exporting redone, seems to be working..
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/audio_driver_jandroid.cpp | 2 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 2 | ||||
| -rw-r--r-- | platform/android/globals/global_defaults.cpp | 2 | ||||
| -rw-r--r-- | platform/android/java_glue.cpp | 2 | ||||
| -rw-r--r-- | platform/android/os_android.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/audio_driver_jandroid.cpp b/platform/android/audio_driver_jandroid.cpp index e0e89e634..415223c1d 100644 --- a/platform/android/audio_driver_jandroid.cpp +++ b/platform/android/audio_driver_jandroid.cpp @@ -28,7 +28,7 @@ /*************************************************************************/ #include "audio_driver_jandroid.h" -#include "globals.h" +#include "global_config.h" #include "os/os.h" #include "thread_jandroid.h" diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 4fc318d4a..1d1ee2562 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -33,7 +33,7 @@ #include "tools/editor/editor_node.h" #include "io/zip_io.h" #include "io/marshalls.h" -#include "globals.h" +#include "global_config.h" #include "os/file_access.h" #include "os/os.h" #include "platform/android/logo.h" diff --git a/platform/android/globals/global_defaults.cpp b/platform/android/globals/global_defaults.cpp index bbf9bd5b0..01daac926 100644 --- a/platform/android/globals/global_defaults.cpp +++ b/platform/android/globals/global_defaults.cpp @@ -27,7 +27,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "global_defaults.h" -#include "globals.h" +#include "global_config.h" void register_android_global_defaults() { diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index dfbb43734..41558cf86 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -36,7 +36,7 @@ #include "file_access_android.h" #include "dir_access_jandroid.h" #include "audio_driver_jandroid.h" -#include "globals.h" +#include "global_config.h" #include "thread_jandroid.h" #include "core/os/keyboard.h" #include "java_class_wrapper.h" diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 1095689a5..229057173 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -36,7 +36,7 @@ #include "servers/visual/visual_server_wrap_mt.h" #include "main/main.h" #include "file_access_android.h" -#include "core/globals.h" +#include "core/global_config.h" #ifdef ANDROID_NATIVE_ACTIVITY #include "file_access_android.h" |