diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-09 17:51:14 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-09 17:51:14 +0300 |
| commit | ff755f93eb86e3f7f6801918457ca77a3001671b (patch) | |
| tree | 58d6def002b427db665a504f08d25eae335bd9d9 /platform | |
| parent | d45be7d9f43046365fcfbf97420f9eca636c51e7 (diff) | |
| parent | be4e40e90a5a322f6a7cec4893854ef5b15db600 (diff) | |
Merge branch 'master' of http://github.com/okamstudio/godot
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/export/export.cpp | 2 | ||||
| -rw-r--r-- | platform/isim/detect.py | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 89f121c3f6..3e4ea8a4e0 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1229,7 +1229,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d } if (!FileAccess::exists(keystore)) { - EditorNode::add_io_error("Could not find keytore, unable to export."); + EditorNode::add_io_error("Could not find keystore, unable to export."); return ERR_FILE_CANT_OPEN; } diff --git a/platform/isim/detect.py b/platform/isim/detect.py index f4a17838f9..8d60e30d25 100644 --- a/platform/isim/detect.py +++ b/platform/isim/detect.py @@ -60,14 +60,18 @@ def configure(env): '-Xlinker', '-objc_abi_version', '-Xlinker', '2', + '-framework', 'AudioToolbox', + '-framework', 'AVFoundation', + '-framework', 'CoreAudio', + '-framework', 'CoreGraphics', + '-framework', 'CoreMedia', '-framework', 'Foundation', + '-framework', 'Security', '-framework', 'UIKit', - '-framework', 'IOKit', - '-framework', 'CoreGraphics', + '-framework', 'MediaPlayer', '-framework', 'OpenGLES', '-framework', 'QuartzCore', - '-framework', 'AudioToolbox', - '-framework', 'MediaPlayer', + '-framework', 'SystemConfiguration', '-F$ISIMSDK', ]) |