Library_merged.mk | 10 ++++++++++
RepositoryExternal.mk | 2 +-
configure.ac | 5 +++++
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
4 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 532e8ccd8b5fe7c2b7eee4ff167ac6c53b9ba87d
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Tue Apr 8 10:30:47 2014 +0200
Better to use dependency on package here.
Change-Id: I697a2bd24d80ac236f7336e318a338cde788c7d4
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2892a71..722e22f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -246,7 +246,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
))
define gb_LinkTarget__use_glew
-$(call gb_LinkTarget_use_external_project,$(1),glew)
+$(call gb_LinkTarget_use_package,$(1),glew)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,glew/include) \
$$(INCLUDE) \
commit e67f8ecfd5d3feba99fab28aa03a802bd49c8fbb
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Fri Mar 21 16:26:50 2014 +0100
vclopengl needs to be in libmerged
Change-Id: I7265aa6f79bcee99bf5c60dc21b61ea95ae85864
diff --git a/Library_merged.mk b/Library_merged.mk
index 61075ab..2d7b0f2 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -31,8 +31,10 @@ $(eval $(call gb_Library_use_libraries,merged,\
))
$(eval $(call gb_Library_use_externals,merged,\
+ icu_headers \
icui18n \
icuuc \
+ boost_headers \
boostdatetime \
$(call gb_Helper_optional,DESKTOP,clucene) \
cups \
@@ -41,6 +43,7 @@ $(eval $(call gb_Library_use_externals,merged,\
expat \
gconf \
gio \
+ glew \
graphite \
$(if $(ENABLE_GTK),gtk) \
harfbuzz \
@@ -52,6 +55,7 @@ $(eval $(call gb_Library_use_externals,merged,\
liblangtag \
libxml2 \
libxslt \
+ mesa_headers \
mythes \
nss3 \
telepathy \
@@ -89,8 +93,11 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,merged,\
-lm \
-ldl \
+ -lGL \
+ -lGLU \
-lpthread \
-lrt \
+ -lX11 \
))
endif
@@ -99,12 +106,14 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\
advapi32 \
gdi32 \
gdiplus \
+ glu32 \
imm32 \
mpr \
msimg32 \
oldnames \
ole32 \
oleaut32 \
+ opengl32 \
shell32 \
shlwapi \
user32 \
@@ -133,6 +142,7 @@ $(eval $(call
gb_Library_use_system_darwin_frameworks,merged,\
Cocoa \
CoreFoundation \
CoreServices \
+ OpenGL \
QuickTime \
))
endif
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 0388d96..ad9b478 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -150,6 +150,7 @@ gb_MERGEDLIBS := \
utl \
uui \
vcl \
+ $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
xmlscript \
xo \
xstor \
commit 07e1f3c10ebcc395c6ecf484204338826d699120
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Tue Apr 8 00:41:47 2014 +0200
Revert "Remove --disable-lpsolve configure option."
This reverts commit 0737d4f6f9d5db5197ce4f35214a785250b8e848.
Commit adding --with-lpsolver was reverted in
8dc394d5c573e5583760c7cc56c5c19062d3f062.
Change-Id: I27598f25f05edafd6afae49d85f81b60f9a0e0a3
diff --git a/configure.ac b/configure.ac
index c05271e..52fa3d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,6 +783,11 @@ AC_ARG_ENABLE(ext-wiki-publisher,
[Enable the Wiki Publisher extension.])
)
+AC_ARG_ENABLE(lpsolve,
+ AS_HELP_STRING([--disable-lpsolve],
+ [Disable compilation of the lp solve solver ])
+)
+
AC_ARG_ENABLE(pdfimport,
AS_HELP_STRING([--disable-pdfimport],
[Disable building the PDF import feature.])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
