Library_merged.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
New commits: commit 0f3438c26dae8aa9042edc7cece876b841926dd3 Author: Noel Grandin <[email protected]> Date: Mon Dec 1 15:18:28 2014 +0200 --enabled-mergedlibs, missing setupapi DLL on windows Change-Id: I72c63e26492c575e6b86a23f2c6069ac557ee7da diff --git a/Library_merged.mk b/Library_merged.mk index 1525a89..d3c5e75 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -133,6 +133,7 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\ opengl32 \ shell32 \ shlwapi \ + setupapi \ user32 \ usp10 \ uuid \ commit c870721fcb641a7a9d976474450d63327b771126 Author: Noel Grandin <[email protected]> Date: Fri Nov 28 14:49:26 2014 +0200 --enabled-mergedlibs, don't use glxtest on windows Change-Id: I6175bc4d648d3a1d88462f1cf8956c2d95d15210 diff --git a/Library_merged.mk b/Library_merged.mk index b38c4be..1525a89 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,\ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
