Mercurial > solar_system

diff CMakeLists.txt @ 3:4f8b47ac2715

find changesets by author, revision, files, or words in the commit message
Aborted test of loading an MD2 model. The GLTools TriangleBatch class doesn't play nicely with MD2, as it erroneously marks vertices as duplicates of each other.
author Eris Caffee <discordia@eldalin.com>
date Sun, 28 Apr 2013 18:04:27 -0500
parents c24af3462002
children
line diff
     1.1 --- a/CMakeLists.txt	Sat Apr 27 13:22:17 2013 -0500
     1.2 +++ b/CMakeLists.txt	Sun Apr 28 18:04:27 2013 -0500
     1.3 @@ -117,7 +117,7 @@
     1.4  #   C    -std=gnu99 -std=c99
     1.5  
     1.6  if (CMAKE_COMPILER_IS_GNUCXX)
     1.7 -  add_definitions(-pedantic -Wall -std=c++0x)
     1.8 +  add_definitions( -Wall -std=c++0x)
     1.9  endif ()
    1.10  
    1.11  
    1.12 @@ -135,11 +135,12 @@
    1.13  
    1.14  file (GLOB SRCS src/*.c src/*.cpp     
    1.15    /home/eris/gamedev/study/OpenGL_Superbible/work/Src/GLTools/src/*
    1.16 +  /home/eris/gamedev/projects/MD2/src/*
    1.17  )
    1.18  file (GLOB HDRS include/*.h include/*.hpp     
    1.19    /home/eris/gamedev/study/OpenGL_Superbible/work/Src/GLTools/include/*     
    1.20    /home/eris/gamedev/study/OpenGL_Superbible/work/Src/GLTools/include/GL/*
    1.21 -
    1.22 +  /home/eris/gamedev/projects/MD2/include/*
    1.23  )
    1.24  
    1.25  # The directories that contain the libraries we will be linking against.
    1.26 @@ -153,6 +154,7 @@
    1.27    ${CMAKE_SOURCE_DIR}/include
    1.28    /home/eris/gamedev/study/OpenGL_Superbible/work/Src/GLTools/include/
    1.29    /home/eris/gamedev/study/OpenGL_Superbible/work/Src/GLTools/include/GL
    1.30 +  /home/eris/gamedev/projects/MD2/include
    1.31    )
    1.32  
    1.33  # Define the executable program file we are creating.  We must list all of