diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-24 23:13:43 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-24 23:14:54 +0100 |
| commit | b144f0ac8695dd62a2053b4e88212d0b109c9a41 (patch) | |
| tree | 05c37eb2fe61cea05c772cd13752a76e146c2e8a /Library_merged.mk | |
| parent | 7f6770f90e1c255d83bf75a97b10ccd2b1f984e9 (diff) | |
fix libmerged build: missing glxtest
Change-Id: Id40d5d21e4e315a605bd41eac01de5cfa04837d4
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 533acb0a542b..b38c4be490b3 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -30,11 +30,11 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) -ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_use_static_libraries,merged,\ - headless \ + glxtest \ + $(if $(filter unx,$(GUIBASE)),headless) \ )) -endif + $(eval $(call gb_Library_use_externals,merged,\ icu_headers \ |