merge vcllo and vclopengllo

Change-Id: I419ca67dc1f87dd9ac751aa5a094fecf58136edb

4 files changed, 26 insertions, 91 deletions

diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index dd5ee952a90c..d7962d846523 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_Executable_use_libraries,icontest,\
     tl \
     ucbhelper \
     vcl \
-    vclopengl \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,icontest,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3ff6778181c5..c680634dc4b2 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_set_include,vcl,\
 
 $(eval $(call gb_Library_add_defs,vcl,\
     -DVCL_DLLIMPLEMENTATION \
+    -DVCLOPENGL_DLLIMPLEMENTATION \
 	-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \
 	-DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \
 	-DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \
@@ -89,6 +90,17 @@ $(eval $(call gb_Library_add_libs,vcl,\
     -lobjc \
 ))
 endif
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+    $(gb_OBJCXXFLAGS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/osx/OpenGLWrapper \
+))
+
+endif
 
 ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Library_use_libraries,vcl,\
@@ -99,14 +111,21 @@ endif
 $(eval $(call gb_Library_use_externals,vcl,\
 	boost_headers \
 	gio \
+	glew \
+	glm_headers \
 	harfbuzz \
-	icuuc \
 	icu_headers \
+	icuuc \
 	lcms2 \
+	mdds_headers \
+	mesa_headers \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
 	vcl/opengl/gdiimpl \
+    vcl/source/opengl/OpenGLContext \
+    vcl/source/opengl/OpenGLHelper \
+    vcl/source/window/openglwin \
     vcl/source/window/settings \
     vcl/source/window/paint \
     vcl/source/window/resource \
@@ -477,6 +496,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
     Cocoa \
     Carbon \
     CoreFoundation \
+	OpenGL \
 ))
 
 ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
@@ -646,9 +666,11 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\
 	advapi32 \
 	gdi32 \
 	gdiplus \
+    glu32 \
 	imm32 \
 	mpr \
 	msimg32 \
+    opengl32 \
 	ole32 \
 	shell32 \
 	usp10 \
@@ -674,6 +696,9 @@ $(eval $(call gb_Library_add_libs,vcl,\
 	-lm \
 	-ldl \
 	-lpthread \
+    -lGL \
+    -lGLU \
+    -lX11 \
 ))
 endif
 
diff --git a/vcl/Library_vclopengl.mk b/vcl/Library_vclopengl.mk
deleted file mode 100644
index e61dd8a9bb31..000000000000
--- a/vcl/Library_vclopengl.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,vclopengl))
-
-$(eval $(call gb_Library_set_include,vclopengl,\
-    -I$(SRCDIR)/vcl/inc/ \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_add_defs,vclopengl,\
-    -DVCLOPENGL_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_externals,vclopengl,\
-	boost_headers \
-	mdds_headers \
-	glm_headers \
-	mesa_headers \
-	glew \
-))
-
-$(eval $(call gb_Library_use_sdk_api,vclopengl))
-
-$(eval $(call gb_Library_use_libraries,vclopengl,\
-    comphelper \
-    cppu \
-    cppuhelper \
-    sal \
-	tl \
-    vcl \
-    $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,vclopengl,\
-    vcl/source/opengl/OpenGLContext \
-    vcl/source/opengl/OpenGLHelper \
-    vcl/source/window/openglwin \
-))
-
-ifeq ($(OS),MACOSX)
-
-$(eval $(call gb_Library_add_cxxflags,vclopengl,\
-    $(gb_OBJCXXFLAGS) \
-))
-
-$(eval $(call gb_Library_add_libs,vcl,\
-    -framework IOKit \
-    -F/System/Library/PrivateFrameworks \
-    -framework CoreUI \
-    -lobjc \
-))
-
-$(eval $(call gb_Library_add_exception_objects,vclopengl,\
-    vcl/osx/OpenGLWrapper \
-))
-
-endif
-
-ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_Library_use_system_win32_libs,vclopengl,\
-    opengl32 \
-    gdi32 \
-    glu32 \
-))
-else ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_use_system_darwin_frameworks,vclopengl,\
-	OpenGL \
-    Cocoa \
-    Carbon \
-    CoreFoundation \
-))
-else ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,vclopengl,\
-    -ldl \
-    -lGL \
-    -lGLU \
-    -lX11 \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 51c5d3ff0ab1..693c625e8269 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
         Executable_svptest \
         Executable_svpclient \
         Executable_vcldemo) \
-    Library_vclopengl \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,vcl,\