Kaydet (Commit) 10be411f authored tarafından Zolnai Tamás's avatar Zolnai Tamás

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

Change-Id: I45b2e0f772f7bcc47bc2e0ce2c7639ef775b379b
üst 40c8121f
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX #define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
#include <vcl/OpenGLContext.hxx>
class Window; class Window;
...@@ -26,9 +25,6 @@ public: ...@@ -26,9 +25,6 @@ public:
protected: protected:
Window* getWindow() const; Window* getWindow() const;
private:
OpenGLContext m_aOpenGLContext;
}; };
} // namespace sdr } // namespace sdr
......
...@@ -75,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ ...@@ -75,7 +75,6 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
utl \ utl \
vcl \ vcl \
xo \ xo \
$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
...@@ -83,8 +82,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\ ...@@ -83,8 +82,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \ boost_headers \
icuuc \ icuuc \
icu_headers \ icu_headers \
mesa_headers \
glew \
)) ))
$(eval $(call gb_Library_add_exception_objects,svxcore,\ $(eval $(call gb_Library_add_exception_objects,svxcore,\
......
...@@ -18,9 +18,6 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj( ...@@ -18,9 +18,6 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
ObjectContact& rObjectContact, ViewContact& rViewContact ) ObjectContact& rObjectContact, ViewContact& rViewContact )
: ViewObjectContactOfSdrObj( rObjectContact, 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() ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment