mirror of https://github.com/AxioDL/metaforce.git
Update fmt flags, fixes Windows build
This commit is contained in:
parent
5ecc52b42b
commit
37e833e6b4
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit fc3e9a51d2c8cf449c05b9eeb1da251ea389ea53
|
||||
Subproject commit a87e8bb39f8548f1418a5f68353c9fca890ba5df
|
|
@ -1 +1 @@
|
|||
Subproject commit 500775f3db012f7516ff081cb0f18d4a266299f1
|
||||
Subproject commit fa89c9c1380bb8b5bfee329e45ede41c86e7c825
|
|
@ -1 +1 @@
|
|||
Subproject commit 8fdc893c868e188b3995c19cbaa9bc3c10814585
|
||||
Subproject commit 311d20532e5c94d605f6725f1ba2b9a4b196aef1
|
Loading…
Reference in New Issue