diff --git a/genconfig b/genconfig index 5da3fd2463..44bab849ce 160000 --- a/genconfig +++ b/genconfig @@ -1 +1 @@ -Subproject commit 5da3fd2463288d9e048dbf3ea41f2bad0a4287a8 +Subproject commit 44bab849ce87fceafd74703bfcf2b61a1a1b738f diff --git a/meson.build b/meson.build index ac1dee1bba..7adc8a2901 100644 --- a/meson.build +++ b/meson.build @@ -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') diff --git a/toml.cpp b/toml.cpp index 16a931b5a6..8aef3dfdb4 100644 --- a/toml.cpp +++ b/toml.cpp @@ -1,3 +1,3 @@ #define TOML_HEADER_ONLY 0 #define TOML_IMPLEMENTATION -#include +#include diff --git a/ui/xemu-settings.cc b/ui/xemu-settings.cc index 42f2cfbaf1..beeeb77017 100644 --- a/ui/xemu-settings.cc +++ b/ui/xemu-settings.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include