strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

post glew->epoxy, we don't need to link to win openg32 and mac OpenGL

Browse source 
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>
This commit is contained in:
Caolán McNamara 2016-12-13 11:41:07 +00:00
parent fab6eaa68b
commit 48b561c770
8 changed files with 0 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
avmedia/Library_avmediaogl.mk
View file

@ -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:

15
canvas/Library_oglcanvas.mk
View file

@ -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:

15
chart2/Library_chartcore.mk
View file

@ -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:

15
chart2/Library_chartopengl.mk
View file

@ -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:

18
slideshow/Library_OGLTrans.mk
View file

@ -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 \

3
vcl/CppunitTest_vcl_wmf_test.mk
View file

@ -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 \

11
vcl/Executable_icontest.mk
View file

@ -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

3
vcl/Library_vcl.mk
View file

@ -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 \