summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAdam Mitz <mitza@objectcomputing.com>2021-03-19 17:24:49 -0500
committerAdam Mitz <mitza@objectcomputing.com>2021-03-19 17:24:49 -0500
commit59a3aec11c069ed9fc1e8348f9b991f8155af88f (patch)
tree5712c5b335bddeb47be6438809a368abee7eb49b /config
parentf38ef549831277da3af7d2b36d584ec1ef5459c5 (diff)
downloadMPC-59a3aec11c069ed9fc1e8348f9b991f8155af88f.tar.gz
glib: support for finding headers directly in GLIB_ROOT/include
conditional based on an MPC feature, default is to work as it did before this change
Diffstat (limited to 'config')
-rw-r--r--config/glib.mpb11
1 files changed, 9 insertions, 2 deletions
diff --git a/config/glib.mpb b/config/glib.mpb
index c7192cc7..0f9a9095 100644
--- a/config/glib.mpb
+++ b/config/glib.mpb
@@ -10,9 +10,16 @@ project {
lib
}
- includes += $(GLIB_ROOT)/include/glib-$(GLIB_VERSION) \
- $(GLIB_ROOT)/$(GLIB_LIB_DIR)/glib-$(GLIB_VERSION)/include
libpaths += $(GLIB_ROOT)/lib
lit_libs += glib-$(GLIB_VERSION)
}
+
+feature(glib_versioned_includes) {
+ includes += $(GLIB_ROOT)/include/glib-$(GLIB_VERSION) \
+ $(GLIB_ROOT)/$(GLIB_LIB_DIR)/glib-$(GLIB_VERSION)/include
+}
+
+feature(!glib_versioned_includes) {
+ includes += $(GLIB_ROOT)/include
+}