Skip to content

Commit

Permalink
tomlplusplus: Allow using system library
Browse files Browse the repository at this point in the history
  • Loading branch information
abouvier authored and mborgerson committed Jun 25, 2022
1 parent 9d2d869 commit 482b2ea
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion genconfig
Submodule genconfig updated 1 files
+1 −1 cnode.h
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -838,9 +838,9 @@ if 'CONFIG_OPENGL' in config_host
endif

tomllib = static_library('tomlpp', sources: files('toml.cpp'),
include_directories: 'tomlplusplus')
include_directories: 'tomlplusplus/include')
toml = declare_dependency(compile_args: ['-DTOML_HEADER_ONLY=0'],
include_directories: 'tomlplusplus',
include_directories: 'tomlplusplus/include',
link_with: tomllib)

genconfig = declare_dependency(include_directories: 'genconfig')
Expand Down
2 changes: 1 addition & 1 deletion toml.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#define TOML_HEADER_ONLY 0
#define TOML_IMPLEMENTATION
#include <toml.hpp>
#include <toml++/toml.h>
2 changes: 1 addition & 1 deletion ui/xemu-settings.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <stdbool.h>
#include <assert.h>
#include <stdio.h>
#include <toml.hpp>
#include <toml++/toml.h>
#include <cnode.h>
#include <sstream>
#include <iostream>
Expand Down

0 comments on commit 482b2ea

Please sign in to comment.