ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tomlplusplus: Compile independently

This commit is contained in:
Matt Borgerson 2022-04-22 01:56:12 -07:00 committed by mborgerson
parent d14cdbc7ba
commit 4b50b65fdc
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@ -837,7 +837,12 @@ if 'CONFIG_OPENGL' in config_host
link_args: config_host['OPENGL_LIBS'].split()) link_args: config_host['OPENGL_LIBS'].split())
endif endif
tomlpp = declare_dependency(include_directories: 'tomlplusplus') tomllib = static_library('tomlpp', sources: files('toml.cpp'),
include_directories: 'tomlplusplus')
toml = declare_dependency(compile_args: ['-DTOML_HEADER_ONLY=0'],
include_directories: 'tomlplusplus',
link_with: tomllib)
genconfig = declare_dependency(include_directories: 'genconfig') genconfig = declare_dependency(include_directories: 'genconfig')
xemu_gtk = declare_dependency(compile_args: config_host['XEMU_GTK_CFLAGS'].split(), xemu_gtk = declare_dependency(compile_args: config_host['XEMU_GTK_CFLAGS'].split(),
@ -2315,7 +2320,7 @@ specific_ss.add(files('xemu-xbe.c', 'xemu-version.c'))
common_ss.add(files('cpus-common.c')) common_ss.add(files('cpus-common.c'))
common_ss.add(tomlpp) common_ss.add(toml)
common_ss.add(genconfig) common_ss.add(genconfig)
subdir('softmmu') subdir('softmmu')

3
toml.cpp Normal file
View File

@ -0,0 +1,3 @@
#define TOML_HEADER_ONLY 0
#define TOML_IMPLEMENTATION
#include <toml.hpp>

2
ui/xemu-hud.cc
View File

@ -1688,12 +1688,10 @@ protected:
public: public:
bool is_open; bool is_open;
bool should_prompt_auto_update_selection;
AutoUpdateWindow() AutoUpdateWindow()
{ {
is_open = false; is_open = false;
should_prompt_auto_update_selection = false;
} }
~AutoUpdateWindow() ~AutoUpdateWindow()