Browse Source
[frontend] fix Simpleini warnings SI_NO_CONVERSION macro being redefined when provided by cmdline (freebsd, linux, etc) (#2877)
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2877
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
pull/2885/head
lizzie
2 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
1 changed files with
9 additions and
1 deletions
-
src/frontend_common/config.h
|
|
@ -1,3 +1,6 @@ |
|
|
|
|
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project |
|
|
|
|
|
// SPDX-License-Identifier: GPL-3.0-or-later |
|
|
|
|
|
|
|
|
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project |
|
|
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project |
|
|
// SPDX-License-Identifier: GPL-2.0-or-later |
|
|
// SPDX-License-Identifier: GPL-2.0-or-later |
|
|
|
|
|
|
|
|
@ -7,7 +10,12 @@ |
|
|
#include <string> |
|
|
#include <string> |
|
|
#include "common/settings.h" |
|
|
#include "common/settings.h" |
|
|
|
|
|
|
|
|
#define SI_NO_CONVERSION |
|
|
|
|
|
|
|
|
// May be defined on command line by system provided packages (FreeBSD devel/simpleini) |
|
|
|
|
|
// but if building from source, it will not be defined, so just do it conditionally. |
|
|
|
|
|
// Should probably define on CMake anyways but eh |
|
|
|
|
|
#ifndef SI_NO_CONVERSION |
|
|
|
|
|
# define SI_NO_CONVERSION 1 |
|
|
|
|
|
#endif |
|
|
#include <SimpleIni.h> |
|
|
#include <SimpleIni.h> |
|
|
#include <boost/algorithm/string/replace.hpp> |
|
|
#include <boost/algorithm/string/replace.hpp> |
|
|
|
|
|
|
|
|
|
