xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-26 21:10:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tomlplusplus: Allow using system library

Browse Source
This commit is contained in:
Alexandre Bouvier 2022-06-22 10:00:05 +02:00 committed by mborgerson
parent 9d2d8691b5
commit 482b2ea31d
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
genconfig

@ -1 +1 @@
Subproject commit 5da3fd2463288d9e048dbf3ea41f2bad0a4287a8 Subproject commit 44bab849ce87fceafd74703bfcf2b61a1a1b738f

4
meson.build
View File

@ -838,9 +838,9 @@ if 'CONFIG_OPENGL' in config_host
endif endif
tomllib = static_library('tomlpp', sources: files('toml.cpp'), tomllib = static_library('tomlpp', sources: files('toml.cpp'),
include_directories: 'tomlplusplus') include_directories: 'tomlplusplus/include')
toml = declare_dependency(compile_args: ['-DTOML_HEADER_ONLY=0'], toml = declare_dependency(compile_args: ['-DTOML_HEADER_ONLY=0'],
include_directories: 'tomlplusplus', include_directories: 'tomlplusplus/include',
link_with: tomllib) link_with: tomllib)
genconfig = declare_dependency(include_directories: 'genconfig') genconfig = declare_dependency(include_directories: 'genconfig')

2
toml.cpp
View File

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

2
ui/xemu-settings.cc
View File

@ -25,7 +25,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <toml.hpp> #include <toml++/toml.h>
#include <cnode.h> #include <cnode.h>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>