summaryrefslogtreecommitdiff
path: root/platform/android/export
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-02-19 23:19:30 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-02-19 23:21:35 -0300
commitf6950956bdab064cc1e027b93a0ddd0d94dda882 (patch)
tree595f634ffbd8d5419c82500971e5c3ce2308d229 /platform/android/export
parent5e3fc7d06956dcda8b50cd4f028c83cf967f7223 (diff)
Editor Export Settings Dialog is completed!! Now on to make some exporters..
Diffstat (limited to 'platform/android/export')
-rw-r--r--platform/android/export/export.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 8e1fda74ed..4fc318d4ae 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -29,7 +29,7 @@
#include "version.h"
#include "export.h"
#include "tools/editor/editor_settings.h"
-#include "tools/editor/editor_import_export.h"
+#include "tools/editor/editor_export.h"
#include "tools/editor/editor_node.h"
#include "io/zip_io.h"
#include "io/marshalls.h"
@@ -1892,9 +1892,11 @@ EditorExportPlatformAndroid::~EditorExportPlatformAndroid() {
memdelete(device_thread);
}
+#endif
void register_android_exporter() {
+#if 0
String exe_ext=OS::get_singleton()->get_name()=="Windows"?"exe":"";
EDITOR_DEF("export/android/adb","");
EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/adb",PROPERTY_HINT_GLOBAL_FILE,exe_ext));
@@ -1913,6 +1915,6 @@ void register_android_exporter() {
Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>( memnew(EditorExportPlatformAndroid) );
EditorImportExport::get_singleton()->add_export_platform(exporter);
-
-}
#endif
+}
+