diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-28 14:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-12-02 08:58:48 +0200 |
| commit | c870721fcb641a7a9d976474450d63327b771126 (patch) | |
| tree | bb1524a49e7333f193022650a4c90b44dbc283ef /Library_merged.mk | |
| parent | 5b829710d65310c6082c2c65ec1239515e319a8e (diff) | |
--enabled-mergedlibs, don't use glxtest on windows
Change-Id: I6175bc4d648d3a1d88462f1cf8956c2d95d15210
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 10 |
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,\ |