strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

--enabled-mergedlibs, don't use glxtest on windows

Browse source 
Change-Id: I6175bc4d648d3a1d88462f1cf8956c2d95d15210
This commit is contained in:
Noel Grandin 2014-11-28 14:49:26 +02:00
parent 5b829710d6
commit c870721fcb
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Library_merged.mk
View file

@ -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,\