vclopengl is buildable on all platforms now

Change-Id: I2d65035eb30e9a96ab4ddc695fc7bc3aaaa9ab6c

vclopengl is buildable on all platforms now
Change-Id: I2d65035eb30e9a96ab4ddc695fc7bc3aaaa9ab6c
d276ad15 · Zolnai Tamás · 67f6bff3 · d276ad15 · d276ad15
Kaydet (Commit) d276ad15 authored Nis 24, 2014 tarafından Zolnai Tamás
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

pre_MergedLibsList.mk solenv/gbuild/extensions/pre_MergedLibsList.mk +1 -1

Library_svxcore.mk svx/Library_svxcore.mk +1 -1

No files found.
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -150,7 +150,7 @@ gb_MERGEDLIBS := \
 	utl \
 	uui \
 	vcl \
-	$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
+	vclopengl \
 	xmlscript \
 	xo \
 	xstor \

--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -74,8 +74,8 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
    ucbhelper \
    utl \
    vcl \
+    vclopengl \
    xo \
-    $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
 	$(gb_UWINAPI) \
 ))