AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 23:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Update fmt flags, fixes Windows build

Browse Source
This commit is contained in:
Luke Street
2021-04-06 17:59:52 -04:00
parent 5ecc52b42b
commit 37e833e6b4
6 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -156,6 +156,8 @@ if(MSVC)
$<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4805> $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/wd4805>
${VS_OPTIONS}) ${VS_OPTIONS})
string(REPLACE "/GR " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REPLACE " /EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
add_compile_options( add_compile_options(
# Disable exceptions # Disable exceptions
$<$<COMPILE_LANGUAGE:CXX>:/EHsc-> $<$<COMPILE_LANGUAGE:CXX>:/EHsc->
@@ -175,7 +177,6 @@ if(MSVC)
# Use latest C++ standard. # Use latest C++ standard.
$<$<COMPILE_LANGUAGE:CXX>:/std:c++latest> $<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>
) )
add_compile_definitions(FMT_EXCEPTIONS=0 _HAS_EXCEPTIONS=0)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
# Flags for MSVC (not clang-cl) # Flags for MSVC (not clang-cl)
@@ -247,7 +248,6 @@ else()
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_compile_options(-Wno-lto-type-mismatch -Wno-maybe-uninitialized) add_compile_options(-Wno-lto-type-mismatch -Wno-maybe-uninitialized)
endif() endif()
add_compile_definitions(FMT_EXCEPTIONS=0)
if(APPLE) if(APPLE)
add_compile_options(-Wno-error=deprecated-declarations add_compile_options(-Wno-error=deprecated-declarations

2
Editor/locale/genlocales.cpp
View File

@@ -5,8 +5,6 @@
#include "athena/FileReader.hpp" #include "athena/FileReader.hpp"
#include "athena/YAMLDocReader.hpp" #include "athena/YAMLDocReader.hpp"
#define FMT_STRING_ALIAS 1
#define FMT_ENFORCE_COMPILE_STRING 1
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>

2
Editor/locale/locale.hpp
View File

@@ -3,8 +3,6 @@
#include <string_view> #include <string_view>
#include <vector> #include <vector>
#define FMT_STRING_ALIAS 1
#define FMT_ENFORCE_COMPILE_STRING 1
#include <fmt/format.h> #include <fmt/format.h>
namespace locale { namespace locale {

2
extern/athena vendored

Submodule extern/athena updated: fc3e9a51d2...a87e8bb39f

2
extern/boo vendored

Submodule extern/boo updated: 500775f3db...fa89c9c138

2
extern/nod vendored

Submodule extern/nod updated: 8fdc893c86...311d20532e