fix build failures with newer compiler versions

This commit is contained in:
wmayer
2019-02-12 13:10:49 +01:00
parent 3771f1dbc3
commit 2de2edb3ed
5 changed files with 32 additions and 0 deletions

View File

@@ -14,6 +14,12 @@ include_directories(
${XercesC_INCLUDE_DIRS}
)
if(MSVC)
include_directories(
${CMAKE_SOURCE_DIR}/src/3rdParty/OpenGL/api
)
endif(MSVC)
set(ImageGui_LIBS
Image
FreeCADGui

View File

@@ -39,9 +39,13 @@
# include <Windows.h>
# include <GL/gl.h>
# include <GL/glu.h>
# if defined(_MSC_VER) && _MSC_VER >= 1910
# include <GL/glext.h>
# endif
#else
# include <GL/gl.h>
# include <GL/glu.h>
# include <GL/glext.h>
#endif
#include "OpenGLImageBox.h"