mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 15:44:56 +00:00
Update fmt flags, fixes Windows build
This commit is contained in:
@@ -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 {
|
||||
|
||||
2
extern/athena
vendored
2
extern/athena
vendored
Submodule extern/athena updated: fc3e9a51d2...a87e8bb39f
2
extern/boo
vendored
2
extern/boo
vendored
Submodule extern/boo updated: 500775f3db...fa89c9c138
2
extern/nod
vendored
2
extern/nod
vendored
Submodule extern/nod updated: 8fdc893c86...311d20532e
Reference in New Issue
Block a user