Merge with p/lugaru

[lugaru.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 632dc73fe1faf85020b7402b34847291e9aa4d47..4775a5ec9eeb1a6d75139967d163090259844df7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,6 @@ set(LUGARU_SRCS
        ${SRCDIR}/Models.cpp
        ${SRCDIR}/Objects.cpp
        ${SRCDIR}/pack.c
-       ${SRCDIR}/pack_private.c
        ${SRCDIR}/Person.cpp
        ${SRCDIR}/private.c
        ${SRCDIR}/Quaternions.cpp
@@ -81,10 +80,10 @@ set(LUGARU_SRCS
        ${SRCDIR}/Stereo.cpp
        ${SRCDIR}/Animation.cpp
        ${SRCDIR}/Sounds.cpp
+       ${SRCDIR}/Awards.cpp
 )
 
 set(LUGARU_H
-       ${SRCDIR}/Constants.h
        ${SRCDIR}/Frustum.h
        ${SRCDIR}/Account.h
        ${SRCDIR}/Game.h
@@ -108,7 +107,6 @@ set(LUGARU_H
        ${SRCDIR}/openal_wrapper.h
        ${SRCDIR}/gamegl.h
        ${SRCDIR}/glstubs.h
-       ${SRCDIR}/pack_private.h
        ${SRCDIR}/private.h
        ${SRCDIR}/Settings.h
        ${SRCDIR}/Stereo.h
@@ -498,7 +496,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/Source
 )
 
-set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${GLU_LIBRARY} ${OPENGL_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY} ${PLATFORM_LIBS})
+set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${OPENGL_glu_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY} ${PLATFORM_LIBS})
 
 
 if(WIN32)