diff options
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index dea1d8d6c74e..81f774a98644 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,13 +111,24 @@ 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/opengl/salbmp \ + vcl/opengl/scale \ + vcl/opengl/texture \ + vcl/source/opengl/OpenGLContext \ + vcl/source/opengl/OpenGLHelper \ + vcl/source/window/openglwin \ vcl/source/window/settings \ vcl/source/window/paint \ vcl/source/window/resource \ @@ -273,6 +296,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/region \ vcl/source/gdi/regionband \ vcl/source/gdi/salgdilayout \ + vcl/source/gdi/salgdiimpl \ vcl/source/gdi/sallayout \ vcl/source/gdi/salmisc \ vcl/source/gdi/salnativewidgets-none \ @@ -475,6 +499,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ Cocoa \ Carbon \ CoreFoundation \ + OpenGL \ )) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) @@ -532,6 +557,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/plugadapt/salplug \ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ + vcl/unx/generic/gdi/x11windowprovider \ $(if $(filter TRUE,$(ENABLE_CUPS)),\ vcl/unx/generic/printer/cupsmgr \ vcl/unx/generic/printer/printerinfomanager \ @@ -618,11 +644,13 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/opengl/win/gdiimpl \ vcl/win/source/app/saldata \ vcl/win/source/app/salinfo \ vcl/win/source/app/salinst \ vcl/win/source/app/salshl \ vcl/win/source/app/saltimer \ + vcl/win/source/gdi/gdiimpl \ vcl/win/source/gdi/salbmp \ vcl/win/source/gdi/salgdi \ vcl/win/source/gdi/salgdi2 \ @@ -643,9 +671,11 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ advapi32 \ gdi32 \ gdiplus \ + glu32 \ imm32 \ mpr \ msimg32 \ + opengl32 \ ole32 \ shell32 \ usp10 \ @@ -671,6 +701,9 @@ $(eval $(call gb_Library_add_libs,vcl,\ -lm \ -ldl \ -lpthread \ + -lGL \ + -lGLU \ + -lX11 \ )) endif |