summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Library_merged.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index b38c4be490b3..1525a89432f1 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,10 +30,18 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_use_static_libraries,merged,\
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_use_static_libraries,gengal,\
glxtest \
$(if $(filter unx,$(GUIBASE)),headless) \
))
+endif
+
+ifneq ($(OS),LINUX)
+$(eval $(call gb_Library_use_static_libraries,merged,\
+ $(if $(filter unx,$(GUIBASE)),headless) \
+))
+endif
$(eval $(call gb_Library_use_externals,merged,\