Copy config.h approach from wlroots-full.hpp to other public api headers

* Otherwise wayfire could use the config.h of an already installed wayfire installation and lead to confusing linking issues if the options differed (like installed wayfire has xwayland disabled and the new build has it enabled). Signed-off-by: Alfred Wingate <[email protected]>
WayfireWM · Mar 18, 2024 · 65982ed · 65982ed
1 parent b134f11
commit 65982ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/api/wayfire/unstable/wlr-view-events.hpp b/src/api/wayfire/unstable/wlr-view-events.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
-#if __has_include(<wayfire/config.h>)
-    #include <wayfire/config.h>
+// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
+// need to use <wayfire/config.h>
+#ifdef WF_USE_CONFIG_H
+    #include <config.h>
 #else
-    #include "config.h"
+    #include <wayfire/config.h>
 #endif
 
 #include <wayfire/nonstd/wlroots-full.hpp>

diff --git a/src/api/wayfire/unstable/xwl-toplevel-base.hpp b/src/api/wayfire/unstable/xwl-toplevel-base.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
-#if __has_include(<wayfire/config.h>)
-    #include <wayfire/config.h>
+// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
+// need to use <wayfire/config.h>
+#ifdef WF_USE_CONFIG_H
+    #include <config.h>
 #else
-    #include "config.h"
+    #include <wayfire/config.h>
 #endif
 
 #include <wayfire/nonstd/wlroots-full.hpp>