8 files changed, 32 insertions, 15 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 33283eccea..8e1fda74ed 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -38,7 +38,7 @@
 #include "os/os.h"
 #include "platform/android/logo.h"
 #include <string.h>
-
+#if 0
 
 static const char* android_perms[]={
 "ACCESS_CHECKIN_PROPERTIES",
@@ -1915,3 +1915,4 @@ void register_android_exporter() {
 	EditorImportExport::get_singleton()->add_export_platform(exporter);
 
 }
+#endif
diff --git a/platform/bb10/export/export.cpp b/platform/bb10/export/export.cpp
index cc994c8f24..3e6dadb094 100644
--- a/platform/bb10/export/export.cpp
+++ b/platform/bb10/export/export.cpp
@@ -40,7 +40,7 @@
 #include "io/xml_parser.h"
 
 #define MAX_DEVICES 5
-
+#if 0
 class EditorExportPlatformBB10 : public EditorExportPlatform {
 
 	GDCLASS( EditorExportPlatformBB10,EditorExportPlatform );
@@ -827,3 +827,4 @@ void register_bb10_exporter() {
 
 }
 
+#endif
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index e0ff9932cc..ab3d159f34 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -38,6 +38,9 @@
 #include "os/os.h"
 #include "platform/javascript/logo.h"
 #include "string.h"
+
+
+#if 0
 class EditorExportPlatformJavaScript : public EditorExportPlatform {
 
 	GDCLASS( EditorExportPlatformJavaScript,EditorExportPlatform );
@@ -424,3 +427,4 @@ void register_javascript_exporter() {
 
 }
 
+#endif
diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp
index 1cb41cede2..3a97827c16 100644
--- a/platform/osx/export/export.cpp
+++ b/platform/osx/export/export.cpp
@@ -39,7 +39,7 @@
 #include "os/os.h"
 #include "platform/osx/logo.h"
 #include "string.h"
-
+#if 0
 
 class EditorExportPlatformOSX : public EditorExportPlatform {
 
@@ -546,3 +546,4 @@ void register_osx_exporter() {
 
 }
 
+#endif
diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp
index f31c91ef6d..167a5831cf 100644
--- a/platform/uwp/export/export.cpp
+++ b/platform/uwp/export/export.cpp
@@ -65,7 +65,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 *************************************************************************/
 
-
+#if 0
 #include "version.h"
 #include "export.h"
 #include "object.h"
@@ -2390,3 +2390,4 @@ void register_uwp_exporter() {
 	Ref<EditorExportPlatformUWP> exporter = Ref<EditorExportPlatformUWP>(memnew(EditorExportPlatformUWP));
 	EditorImportExport::get_singleton()->add_export_platform(exporter);
 }
+#endif
diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp
index 1ad61844d0..88d534887b 100644
--- a/platform/windows/export/export.cpp
+++ b/platform/windows/export/export.cpp
@@ -29,7 +29,7 @@
 #include "export.h"
 #include "platform/windows/logo.h"
 #include "tools/editor/editor_import_export.h"
-
+#if 0
 void register_windows_exporter() {
 
 	Image img(_windows_logo);
@@ -50,3 +50,4 @@ void register_windows_exporter() {
 
 
 }
+#endif
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index b5f6359d21..89cf639114 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -61,6 +61,7 @@ def get_opts():
         ('use_static_cpp', 'link stdc++ statically', 'no'),
         ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
         ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),
+        ('use_lto', 'Use link time optimization', 'no'),
         ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),
         ('udev', 'Use udev for gamepad connection callbacks', 'no'),
         ('debug_release', 'Add debug symbols to release version', 'no'),
@@ -97,12 +98,12 @@ def configure(env):
         env.extra_suffix = ".llvm"
 
     if (env["use_sanitizer"] == "yes"):
-        env.Append(CXXFLAGS=['-fsanitize=address', '-fno-omit-frame-pointer'])
+        env.Append(CCFLAGS=['-fsanitize=address', '-fno-omit-frame-pointer'])
         env.Append(LINKFLAGS=['-fsanitize=address'])
         env.extra_suffix += "s"
 
     if (env["use_leak_sanitizer"] == "yes"):
-        env.Append(CXXFLAGS=['-fsanitize=address', '-fno-omit-frame-pointer'])
+        env.Append(CCFLAGS=['-fsanitize=address', '-fno-omit-frame-pointer'])
         env.Append(LINKFLAGS=['-fsanitize=address'])
         env.extra_suffix += "s"
 
@@ -111,22 +112,28 @@ def configure(env):
     #	env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
     #	env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
 
-    if (env["target"] == "release"):
+    if (env["use_lto"] == "yes"):
+        env.Append(CCFLAGS=['-flto'])
+        env.Append(LINKFLAGS=['-flto'])
+
+
+    env.Append(CCFLAGS=['-pipe'])
+    env.Append(LINKFLAGS=['-pipe'])
 
+    if (env["target"] == "release"):
+        env.Prepend(CCFLAGS=['-Ofast'])
         if (env["debug_release"] == "yes"):
-            env.Append(CCFLAGS=['-g2'])
-        else:
-            env.Append(CCFLAGS=['-O3', '-ffast-math'])
+            env.Prepend(CCFLAGS=['-g2'])
 
     elif (env["target"] == "release_debug"):
 
-        env.Append(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
+        env.Prepend(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
         if (env["debug_release"] == "yes"):
-            env.Append(CCFLAGS=['-g2'])
+            env.Prepend(CCFLAGS=['-g2'])
 
     elif (env["target"] == "debug"):
 
-        env.Append(CCFLAGS=['-g2', '-Wall', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
+        env.Prepend(CCFLAGS=['-g2', '-Wall', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
 
     env.ParseConfig('pkg-config x11 --cflags --libs')
     env.ParseConfig('pkg-config xinerama --cflags --libs')
diff --git a/platform/x11/export/export.cpp b/platform/x11/export/export.cpp
index c1af323453..5a4751b387 100644
--- a/platform/x11/export/export.cpp
+++ b/platform/x11/export/export.cpp
@@ -30,7 +30,7 @@
 #include "platform/x11/logo.h"
 #include "tools/editor/editor_import_export.h"
 #include "scene/resources/texture.h"
-
+#if 0
 void register_x11_exporter() {
 
 	Image img(_x11_logo);
@@ -50,3 +50,4 @@ void register_x11_exporter() {
 	}
 
 }
+#endif