diff options
| -rw-r--r-- | avmedia/Library_avmediaogl.mk | 10 | ||||
| -rw-r--r-- | canvas/Library_oglcanvas.mk | 15 | ||||
| -rw-r--r-- | chart2/Library_chartcore.mk | 15 | ||||
| -rw-r--r-- | chart2/Library_chartopengl.mk | 15 | ||||
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 18 | ||||
| -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 |
8 files changed, 0 insertions, 90 deletions
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index 191fb75bc6dd..64925bf1a44f 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -43,14 +43,4 @@ $(eval $(call gb_Library_add_exception_objects,avmediaogl,\ avmedia/source/opengl/oglwindow \ )) -ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_use_system_win32_libs,avmediaogl,\ - opengl32 \ -)) -else ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\ - OpenGL \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk index 9d1042dda8d2..2303a8840cb4 100644 --- a/canvas/Library_oglcanvas.mk +++ b/canvas/Library_oglcanvas.mk @@ -45,19 +45,4 @@ $(eval $(call gb_Library_use_externals,oglcanvas,\ epoxy \ )) -ifeq ($(strip $(OS)),MACOSX) -$(eval $(call gb_Library_use_system_darwin_frameworks,oglcanvas,\ - Cocoa \ - OpenGL \ -)) - -else ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_use_system_win32_libs,oglcanvas,\ - gdi32 \ - glu32 \ - opengl32 \ -)) - -endif - # vim: set noet sw=4 ts=4: diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index cc06fbddb6e6..5653331764c4 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -251,19 +251,4 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/tools/XMLRangeHelper \ )) -ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_use_system_win32_libs,chartcore,\ - opengl32 \ - gdi32 \ -)) -else ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\ - OpenGL \ -)) -else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -$(eval $(call gb_Library_add_libs,chartcore,\ - $(DLOPEN_LIBS) \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index 53056aafe0e0..cc668e441ae5 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -56,19 +56,4 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\ chart2/source/view/main/OpenGLRender \ )) -ifeq ($(strip $(OS)),WNT) -$(eval $(call gb_Library_use_system_win32_libs,chartopengl,\ - opengl32 \ - gdi32 \ -)) -else ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\ - OpenGL \ -)) -else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -$(eval $(call gb_Library_add_libs,chartopengl,\ - $(DLOPEN_LIBS) \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index fb04596cb7ba..c7908b666863 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -40,24 +40,6 @@ $(eval $(call gb_Library_use_externals,OGLTrans,\ $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/opengl/ogltrans)) -ifeq ($(strip $(OS)),MACOSX) - -$(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\ - Cocoa \ - GLUT \ - OpenGL \ -)) - -else ifeq ($(strip $(OS)),WNT) - -$(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\ - gdi32 \ - glu32 \ - opengl32 \ -)) - -endif - $(eval $(call gb_Library_add_exception_objects,OGLTrans,\ slideshow/source/engine/opengl/TransitionerImpl \ slideshow/source/engine/opengl/TransitionImpl \ 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 \ |