ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fix typo and libmerged build

Browse Source 
Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858
This commit is contained in:
Matúš Kukan
2014-12-02 10:31:08 +01:00
parent 3b0db84516
commit bb6774a2bd
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Library_merged.mk
+1 -10
View File
@@ -30,19 +30,10 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
))
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 LINUX,$(OS)),glxtest) \
$(if $(filter unx,$(GUIBASE)),headless) \
))
endif
$(eval $(call gb_Library_use_externals,merged,\
icu_headers \