Revert "Remove opengl usage from svx until we can't solve building problems"

This reverts commit 10be411f33c69db83cc5de410eaddf2d297608ae.
This commit is contained in:
Markus Mohrhard 2014-03-31 23:09:24 +02:00
parent cc8f652121
commit feffcbb02c
3 changed files with 10 additions and 0 deletions

View File

@ -11,6 +11,7 @@
#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <vcl/OpenGLContext.hxx>
class Window;
@ -25,6 +26,9 @@ public:
protected:
Window* getWindow() const;
private:
OpenGLContext m_aOpenGLContext;
};
} // namespace sdr

View File

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

View File

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