From ca28e21739b27e7d16d6fb7a1ed3d47000c3aa73 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Tue, 28 May 2019 16:51:30 -1000
Subject: [PATCH] Fixes to support building with GCC

---
 CMakeLists.txt               | 11 ++++++++++-
 src/Editor/CProgressDialog.h | 12 ++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60aa8d56..ba9f110d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.12)
 set(MACOSX_DEPLOYMENT_TARGET 10.10)
 
+# Use release build type as default (assimp complains if this is unset)
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
 project(PrimeWorldEditor CXX)
 
 include(./dew.cmake)
@@ -10,7 +15,11 @@ include(cmake/generate_product_version.cmake)
 
 if(MSVC)
     add_compile_options(/WX /wd4267 /wd4100 /wd4101 /wd4189)
-elseif(APPLE)
+else()
+    add_compile_options(-Wno-multichar)
+endif()
+
+if(APPLE)
     add_compile_definitions(GL_SILENCE_DEPRECATION)
 endif()
 
diff --git a/src/Editor/CProgressDialog.h b/src/Editor/CProgressDialog.h
index 98e6abe9..9290d556 100644
--- a/src/Editor/CProgressDialog.h
+++ b/src/Editor/CProgressDialog.h
@@ -73,12 +73,12 @@ public:
         InternalWaitForResults(Future);
         return Future.result();
     }
-
-    template<>
-    void WaitForResults(QFuture<void> Future)
-    {
-        InternalWaitForResults(Future);
-    }
 };
 
+template<>
+inline void CProgressDialog::WaitForResults(QFuture<void> Future)
+{
+    InternalWaitForResults(Future);
+}
+
 #endif // CPROGRESSDIALOG_H