Commit 18881db3 authored by schultz's avatar schultz

fixed a compile issue on osx

parent 30031b65
...@@ -446,12 +446,6 @@ int main(int argc, char **argv) ...@@ -446,12 +446,6 @@ int main(int argc, char **argv)
} }
} }
} }
//On Apple systems the extensions are loaded automagically by qt so dont call the init functions or include the opengl headers (gl_compat_4_4).
#ifndef __APPLE__
// initOpenGLFunctions();
#endif
//std::cout<<QGLFormat::openGLVersionFlags();
// After setting all Options from command line, build the real gui // After setting all Options from command line, build the real gui
w->init(); w->init();
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <common/glew_wrappers.hh> #include <common/glew_wrappers.hh>
#include <ACG/GL/gl_compat_4_4.hh> #include <ACG/GL/acg_glew.hh>
#include "CoreWidget.hh" #include "CoreWidget.hh"
#include <OpenFlipper/common/FileTypes.hh> #include <OpenFlipper/common/FileTypes.hh>
......
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