From e67f8ecfd5d3feba99fab28aa03a802bd49c8fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@collabora.com>
Date: Fri, 21 Mar 2014 16:26:50 +0100
Subject: [PATCH] vclopengl needs to be in libmerged

Change-Id: I7265aa6f79bcee99bf5c60dc21b61ea95ae85864
---
 Library_merged.mk                              | 10 ++++++++++
 solenv/gbuild/extensions/pre_MergedLibsList.mk |  1 +
 2 files changed, 11 insertions(+)

diff --git a/Library_merged.mk b/Library_merged.mk
index 61075ab7dea2..2d7b0f241817 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 0388d96920ce..ad9b478c2adf 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 \