From 37e833e6b42ed0add2a24ba8754fb9c0d0af3340 Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Tue, 6 Apr 2021 17:59:52 -0400
Subject: [PATCH] Update fmt flags, fixes Windows build

---
 CMakeLists.txt               | 4 ++--
 Editor/locale/genlocales.cpp | 2 --
 Editor/locale/locale.hpp     | 2 --
 extern/athena                | 2 +-
 extern/boo                   | 2 +-
 extern/nod                   | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 775fe0df4..335c53d4c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,6 +156,8 @@ if(MSVC)
           $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4805>
           ${VS_OPTIONS})
 
+  string(REPLACE "/GR " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   add_compile_options(
     # Disable exceptions
     $<$<COMPILE_LANGUAGE:CXX>:/EHsc->
@@ -175,7 +177,6 @@ if(MSVC)
     # Use latest C++ standard.
     $<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>
   )
-  add_compile_definitions(FMT_EXCEPTIONS=0 _HAS_EXCEPTIONS=0)
 
   if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     # Flags for MSVC (not clang-cl)
@@ -247,7 +248,6 @@ else()
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     add_compile_options(-Wno-lto-type-mismatch -Wno-maybe-uninitialized)
   endif()
-  add_compile_definitions(FMT_EXCEPTIONS=0)
 
   if(APPLE)
     add_compile_options(-Wno-error=deprecated-declarations
diff --git a/Editor/locale/genlocales.cpp b/Editor/locale/genlocales.cpp
index a7238059b..36bad71dd 100644
--- a/Editor/locale/genlocales.cpp
+++ b/Editor/locale/genlocales.cpp
@@ -5,8 +5,6 @@
 #include "athena/FileReader.hpp"
 #include "athena/YAMLDocReader.hpp"
 
-#define FMT_STRING_ALIAS 1
-#define FMT_ENFORCE_COMPILE_STRING 1
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 
diff --git a/Editor/locale/locale.hpp b/Editor/locale/locale.hpp
index 0226aef44..86d4aad7e 100644
--- a/Editor/locale/locale.hpp
+++ b/Editor/locale/locale.hpp
@@ -3,8 +3,6 @@
 #include <string_view>
 #include <vector>
 
-#define FMT_STRING_ALIAS 1
-#define FMT_ENFORCE_COMPILE_STRING 1
 #include <fmt/format.h>
 
 namespace locale {
diff --git a/extern/athena b/extern/athena
index fc3e9a51d..a87e8bb39 160000
--- a/extern/athena
+++ b/extern/athena
@@ -1 +1 @@
-Subproject commit fc3e9a51d2c8cf449c05b9eeb1da251ea389ea53
+Subproject commit a87e8bb39f8548f1418a5f68353c9fca890ba5df
diff --git a/extern/boo b/extern/boo
index 500775f3d..fa89c9c13 160000
--- a/extern/boo
+++ b/extern/boo
@@ -1 +1 @@
-Subproject commit 500775f3db012f7516ff081cb0f18d4a266299f1
+Subproject commit fa89c9c1380bb8b5bfee329e45ede41c86e7c825
diff --git a/extern/nod b/extern/nod
index 8fdc893c8..311d20532 160000
--- a/extern/nod
+++ b/extern/nod
@@ -1 +1 @@
-Subproject commit 8fdc893c868e188b3995c19cbaa9bc3c10814585
+Subproject commit 311d20532e5c94d605f6725f1ba2b9a4b196aef1