Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 17:03:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add header for glut to conditional include in InterfaceConfig

Browse source
This commit is contained in:
Stephen Birarda 2013-02-08 14:57:59 -08:00
parent ca0f285abe
commit 08142a8adb
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/CMakeLists.txt
View file

@ -4,11 +4,9 @@ project(interface)
if (APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreServices -framework Carbon")
set(GLUT_HEADER_INCLUDE "<GLUT/glut.h>")
set(GL_EXT_INCLUDE "<OpenGL/glext.h>")
set(GL_HEADERS "#include <GLUT/glut.h>\n#include <OpenGL/glext.h>")
else (APPLE)
set(GLUT_HEADER_INCLUDE "<GL/gl.h>")
set(GL_EXT_INCLUDE "<GL/glext.h>")
set(GL_HEADERS "#include <GLUT/gl.h>\n#include <GLUT/glut.h>\n#include <GL/glext.h>")
endif (APPLE)
configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h)

4
interface/InterfaceConfig.h.in
View file

@ -10,7 +10,7 @@
#define interface__InterfaceConfig__
#define GL_GLEXT_PROTOTYPES 1
#include @GLUT_HEADER_INCLUDE@
#include @GL_EXT_INCLUDE@
@GL_HEADERS@
#endif

1
interface/src/Head.cpp
View file

@ -9,7 +9,6 @@
#include <iostream>
#include <glm/glm.hpp>
#include <cstring>
#include "InterfaceConfig.h"
#include "Head.h"
#include "Util.h"
#include "SerialInterface.h"