summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-10-24 18:53:31 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-11-10 07:58:17 +0100
commitbd3f92fa29b81199fa86729e9236428b4227227a (patch)
tree200823f8fc54ed41bb7ac12a0888e44990480495 /solenv
parent03d04b3ba6248312969a4e7390874c2caa3ac57c (diff)
merge vcllo and vclopengllo
Change-Id: I419ca67dc1f87dd9ac751aa5a094fecf58136edb
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 8f8320a2336e..3c73485ccaf5 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -153,7 +153,6 @@ gb_MERGEDLIBS := \
utl \
uui \
vcl \
- vclopengl \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
$(if $(ENABLE_HEADLESS),,vclplug_svp) \
) \