diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-09-01 00:36:15 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-09-02 01:08:52 +0200 |
commit | a5346d7f3d8a7d4ecf4917a374c9ce930205ff6e (patch) | |
tree | 5ff4b428c048fda01a3bf6f3049cd665cf3c78dc /vcl/Library_vclopengl.mk | |
parent | use size_t instead of unsigned int for container indices (diff) | |
download | core-a5346d7f3d8a7d4ecf4917a374c9ce930205ff6e.tar.gz core-a5346d7f3d8a7d4ecf4917a374c9ce930205ff6e.zip |
switch to a NSOpenGLView implementation
Change-Id: Ifed59a9e899abc900ddf27378eec6b641be061d3
Diffstat (limited to 'vcl/Library_vclopengl.mk')
-rw-r--r-- | vcl/Library_vclopengl.mk | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/vcl/Library_vclopengl.mk b/vcl/Library_vclopengl.mk index 11b46e576d71..e5fbbfe840f8 100644 --- a/vcl/Library_vclopengl.mk +++ b/vcl/Library_vclopengl.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Library_Library,vclopengl)) $(eval $(call gb_Library_set_include,vclopengl,\ + -I$(SRCDIR)/vcl/inc/ \ $$(INCLUDE) \ )) @@ -37,12 +38,28 @@ $(eval $(call gb_Library_use_libraries,vclopengl,\ $(gb_UWINAPI) \ )) +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 \ vcl/source/opengl/OpenGLContext \ vcl/source/opengl/OpenGLHelper \ vcl/source/window/openglwin \ )) +endif + ifeq ($(strip $(OS)),WNT) $(eval $(call gb_Library_use_system_win32_libs,vclopengl,\ opengl32 \ @@ -52,6 +69,9 @@ $(eval $(call gb_Library_use_system_win32_libs,vclopengl,\ 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,\ |