Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
18881db3
Commit
18881db3
authored
Jan 25, 2016
by
schultz
Browse files
fixed a compile issue on osx
parent
30031b65
Changes
2
Hide whitespace changes
Inline
Side-by-side
OpenFlipper.cc
View file @
18881db3
...
...
@@ -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
w
->
init
();
...
...
widgets/coreWidget/About.cc
View file @
18881db3
...
...
@@ -60,7 +60,7 @@
//== INCLUDES =================================================================
#include
<common/glew_wrappers.hh>
#include
<ACG/GL/
gl_compat_4_4
.hh>
#include
<ACG/GL/
acg_glew
.hh>
#include
"CoreWidget.hh"
#include
<OpenFlipper/common/FileTypes.hh>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment