diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-31 23:09:24 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-08 04:38:20 +0200 |
| commit | feffcbb02c2cb17d615151f5587ae38510f3aa02 (patch) | |
| tree | 4598584915bccfb8199e83493244a3afbda0f7d2 /svx | |
| parent | cc8f652121eb6f43b718f344bed9619eb5785d8e (diff) | |
Revert "Remove opengl usage from svx until we can't solve building problems"
This reverts commit 10be411f33c69db83cc5de410eaddf2d297608ae.
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Library_svxcore.mk | 3 | ||||
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index f26479cef04e..b3c35215d878 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -75,6 +75,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ utl \ vcl \ xo \ + $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \ $(gb_UWINAPI) \ )) @@ -82,6 +83,8 @@ $(eval $(call gb_Library_use_externals,svxcore,\ boost_headers \ icuuc \ icu_headers \ + mesa_headers \ + glew \ )) $(eval $(call gb_Library_add_exception_objects,svxcore,\ diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx index 2cf0086287f8..1689468993b1 100644 --- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx @@ -18,6 +18,9 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj( ObjectContact& rObjectContact, ViewContact& rViewContact ) : ViewObjectContactOfSdrObj( rObjectContact, rViewContact ) { + m_aOpenGLContext.init(getWindow()); + // Set a dummy size to make the window visible + m_aOpenGLContext.setWinSize(Size(200,200)); } ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj() |