Merge pull request #11883 from wavexx/pch_build_fix

Fix build with precompiled headers
This commit is contained in:
Chris Hennes
2024-01-16 14:06:34 -06:00
committed by GitHub
3 changed files with 8 additions and 6 deletions

View File

@@ -49,6 +49,7 @@
#include <csignal>
#include <cstdio>
#include <ctime>
#include <cfloat>
#ifdef FC_OS_WIN32
# include <crtdbg.h>

View File

@@ -44,6 +44,7 @@
// standard
#include <ios>
#include <cfloat>
// STL
#include <algorithm>

View File

@@ -62,13 +62,8 @@
#include <boost/regex.hpp>
#include <boost/algorithm/string/predicate.hpp>
// Qt Toolkit
#ifndef __QtAll__
# include <Gui/QtAll.h>
#endif
// GL
// Include glext before InventorAll
// Include glext before QtAll/InventorAll
#ifdef FC_OS_WIN32
# include <GL/gl.h>
# include <GL/glext.h>
@@ -87,6 +82,11 @@
// Should come after glext.h to avoid warnings
#include <Inventor/C/glue/gl.h>
// Qt Toolkit
#ifndef __QtAll__
# include <Gui/QtAll.h>
#endif
// Inventor includes OpenGL
#ifndef __InventorAll__
# include <Gui/InventorAll.h>