fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Base] Don't hardcode UTF_CPP_CPLUSPLUS

Browse Source
This commit is contained in:
Margen67
2025-08-10 06:01:43 -07:00
parent 6941b69691
commit 995c105c1c
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/xenia/base/cvar.cc
View File

@@ -9,7 +9,10 @@
#include "xenia/base/cvar.h"
#include <iostream>
#define UTF_CPP_CPLUSPLUS 202002L
// https://github.com/nemtrif/utfcpp/issues/85
#if defined(_MSVC_LANG) && _MSVC_LANG > __cplusplus
#define UTF_CPP_CPLUSPLUS _MSVC_LANG
#endif
#include "third_party/utfcpp/source/utf8.h"
#include "xenia/base/console.h"

5
src/xenia/base/string.cc
View File

@@ -20,7 +20,10 @@
#include <strings.h>
#endif // !XE_PLATFORM_WIN32
#define UTF_CPP_CPLUSPLUS 202002L
// https://github.com/nemtrif/utfcpp/issues/85
#if defined(_MSVC_LANG) && _MSVC_LANG > __cplusplus
#define UTF_CPP_CPLUSPLUS _MSVC_LANG
#endif
#include "third_party/utfcpp/source/utf8.h"
namespace utfcpp = utf8;

5
src/xenia/base/utf8.cc
View File

@@ -12,7 +12,10 @@
#include <algorithm>
#include <cstdint>
#define UTF_CPP_CPLUSPLUS 202002L
// https://github.com/nemtrif/utfcpp/issues/85
#if defined(_MSVC_LANG) && _MSVC_LANG > __cplusplus
#define UTF_CPP_CPLUSPLUS _MSVC_LANG
#endif
#include "third_party/utfcpp/source/utf8.h"
namespace utfcpp = utf8;