diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-17 05:06:00 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-17 08:13:49 +0100 |
| commit | 40ea5e9dd0eff66728d1d2d7aac41349a14de594 (patch) | |
| tree | 135fdbd05d5dcc0859351891482277158f143028 /chart2/Library_chartopengl.mk | |
| parent | bd78139dcbf804e6e0b8be5409436991ac08b36c (diff) | |
Revert "Move OpenGLRender to vcl"
This reverts commit 04b70c682e2cdc52b144961a83d05fd203de6884.
The OpenGLRender is not abstract enough for vcl. Leave it in chart2.
Conflicts:
chart2/source/view/inc/DummyXShape.hxx
chart2/source/view/main/OpenGLRender.hxx
vcl/Library_vclopengl.mk
Change-Id: I5392c8ee34462ff49059126ca2284d8ebe1eb379
Diffstat (limited to 'chart2/Library_chartopengl.mk')
| -rw-r--r-- | chart2/Library_chartopengl.mk | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk index 5ca68bd4eff9..758719695571 100644 --- a/chart2/Library_chartopengl.mk +++ b/chart2/Library_chartopengl.mk @@ -54,6 +54,26 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\ $(eval $(call gb_Library_add_exception_objects,chartopengl,\ chart2/source/view/main/OpenglShapeFactory \ chart2/source/view/main/DummyXShape \ + chart2/source/view/main/OpenGLRender \ )) - + +ifeq ($(strip $(OS)),WNT) +$(eval $(call gb_Library_use_system_win32_libs,chartopengl,\ + opengl32 \ + gdi32 \ + glu32 \ +)) +else ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\ + OpenGL \ +)) +else ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_libs,chartopengl,\ + -ldl \ + -lGL \ + -lGLU \ + -lX11 \ +)) +endif + # vim: set noet sw=4 ts=4: |