diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 11:41:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 21:01:48 +0000 |
| commit | 48b561c770699c9730de25ada2934cda36110eba (patch) | |
| tree | 7cda7504161a323539ba6ccb4603c00a5e2055ab /vcl | |
| parent | fab6eaa68b1c312a4cdaeb8c79ac1ab9c3aad7aa (diff) | |
post glew->epoxy, we don't need to link to win openg32 and mac OpenGL
Change-Id: Iadc373961dcca788b1174ee71cb386979ce064ed
Reviewed-on: https://gerrit.libreoffice.org/31954
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/CppunitTest_vcl_wmf_test.mk | 3 | ||||
| -rw-r--r-- | vcl/Executable_icontest.mk | 11 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk index 7cae3639cd0c..5f21cd84c23c 100644 --- a/vcl/CppunitTest_vcl_wmf_test.mk +++ b/vcl/CppunitTest_vcl_wmf_test.mk @@ -100,7 +100,6 @@ $(eval $(call gb_CppunitTest_use_system_darwin_frameworks,vcl_wmf_test,\ Cocoa \ Carbon \ CoreFoundation \ - OpenGL \ )) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) $(eval $(call gb_CppunitTest_use_libraries,vcl_wmf_test,\ @@ -168,11 +167,9 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,vcl_wmf_test,\ crypt32 \ gdi32 \ gdiplus \ - glu32 \ imm32 \ mpr \ msimg32 \ - opengl32 \ ole32 \ shell32 \ usp10 \ diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index cce8feb48a20..ce163303f8a4 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -38,17 +38,6 @@ $(eval $(call gb_Executable_add_libs,icontest,\ $(eval $(call gb_Executable_use_static_libraries,icontest,\ glxtest \ )) -else ifeq ($(OS),WNT) - -$(eval $(call gb_Executable_use_system_win32_libs,icontest,\ - opengl32 \ -)) - -else ifeq ($(OS),MACOSX) - -$(eval $(call gb_Executable_add_libs,icontest,\ - -framework OpenGL \ -)) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ebffb7c64695..5fd6a82f88cf 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -508,7 +508,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ Cocoa \ Carbon \ CoreFoundation \ - OpenGL \ )) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) @@ -705,11 +704,9 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ crypt32 \ gdi32 \ gdiplus \ - glu32 \ imm32 \ mpr \ msimg32 \ - opengl32 \ ole32 \ shell32 \ usp10 \ |