Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenFlipper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
18881db3
Commit
18881db3
authored
Jan 25, 2016
by
schultz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed a compile issue on osx
parent
30031b65
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
OpenFlipper.cc
OpenFlipper.cc
+0
-6
widgets/coreWidget/About.cc
widgets/coreWidget/About.cc
+1
-1
No files found.
OpenFlipper.cc
View file @
18881db3
...
@@ -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
();
...
...
widgets/coreWidget/About.cc
View file @
18881db3
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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