diff options
| author | Saracen <SaracenOne@gmail.com> | 2015-11-18 23:18:10 +0000 |
|---|---|---|
| committer | Saracen <SaracenOne@gmail.com> | 2015-11-18 23:18:10 +0000 |
| commit | dd00452997122029dd2f74a278574d781fd2bf5f (patch) | |
| tree | e36f0c62cac499500724c2929100c042972d1a5c /platform/iphone/godot_iphone.cpp | |
| parent | c1d19ad258139c73e7aa81cf6e1fbd99e1bfe38b (diff) | |
| parent | 94fdd01241749cb7a575ed5f9fa4c7bbb286901a (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color
Conflicts:
drivers/gles2/shader_compiler_gles2.cpp
Diffstat (limited to 'platform/iphone/godot_iphone.cpp')
| -rw-r--r-- | platform/iphone/godot_iphone.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/iphone/godot_iphone.cpp b/platform/iphone/godot_iphone.cpp index b7b9b747b4..f0cb929429 100644 --- a/platform/iphone/godot_iphone.cpp +++ b/platform/iphone/godot_iphone.cpp @@ -40,6 +40,8 @@ int add_path(int p_argc, char** p_args); int add_cmdline(int p_argc, char** p_args); }; +int iphone_main(int, int, int, char**); + int iphone_main(int width, int height, int argc, char** argv) { int len = strlen(argv[0]); |