Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 08:16:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove glut.h from CmakeLists.txt and fix a compiler issue with Hair.cpp

Browse source
This commit is contained in:
ZappoMan 2014-12-19 13:53:44 -08:00
parent 22e2fcf746
commit 2e3a522e73
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/CMakeLists.txt
View file

@ -25,15 +25,15 @@ else ()
endif () endif ()
if (APPLE) if (APPLE)
set(GL_HEADERS "#include <GLUT/glut.h>\n#include <OpenGL/glext.h>") set(GL_HEADERS "#include <OpenGL/glext.h>")
elseif (UNIX) elseif (UNIX)
# include the right GL headers for UNIX # include the right GL headers for UNIX
set(GL_HEADERS "#include <GL/gl.h>\n#include <GL/glut.h>\n#include <GL/glext.h>") set(GL_HEADERS "#include <GL/gl.h>\n#include <GL/glext.h>")
elseif (WIN32) elseif (WIN32)
add_definitions(-D_USE_MATH_DEFINES) # apparently needed to get M_PI and other defines from cmath/math.h add_definitions(-D_USE_MATH_DEFINES) # apparently needed to get M_PI and other defines from cmath/math.h
add_definitions(-DWINDOWS_LEAN_AND_MEAN) # needed to make sure windows doesn't go to crazy with its defines add_definitions(-DWINDOWS_LEAN_AND_MEAN) # needed to make sure windows doesn't go to crazy with its defines
set(GL_HEADERS "#include <windowshacks.h>\n#include <GL/glew.h>\n#include <GL/glut.h>\n#include <GL/wglew.h>") set(GL_HEADERS "#include <windowshacks.h>\n#include <GL/glew.h>\n#include <GL/wglew.h>")
endif () endif ()
# set up the external glm library # set up the external glm library

2
interface/src/Hair.cpp
View file

@ -10,6 +10,8 @@
// //
// Creates single flexible verlet-integrated strands that can be used for hair/fur/grass // Creates single flexible verlet-integrated strands that can be used for hair/fur/grass
#include <gpu/GPUConfig.h>
#include "Hair.h" #include "Hair.h"
#include "Util.h" #include "Util.h"