X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=5b0d0ab163cd5ab328a10cb1e93cc2b58fdbb6bb;hb=46cff1de1e828cb8c04a5dc5377bc07baae57858;hp=383779d1e0b92473765430a17a554627eb404cdd;hpb=92988d26b0a3342e9934570d896311c38d94f4fd;p=lugaru.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 383779d..5b0d0ab 100644 --- 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 @@ -70,20 +69,22 @@ set(LUGARU_SRCS ${SRCDIR}/Skybox.cpp ${SRCDIR}/Sprite.cpp ${SRCDIR}/Terrain.cpp + ${SRCDIR}/Texture.cpp ${SRCDIR}/Text.cpp ${SRCDIR}/TGALoader.cpp ${SRCDIR}/unpack.c - ${SRCDIR}/unpack_private.c ${SRCDIR}/Weapons.cpp ${SRCDIR}/OpenGL_Windows.cpp ${SRCDIR}/openal_wrapper.cpp ${SRCDIR}/Input.cpp ${SRCDIR}/Settings.cpp ${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 @@ -99,6 +100,7 @@ set(LUGARU_H ${SRCDIR}/Sprite.h ${SRCDIR}/TGALoader.h ${SRCDIR}/Terrain.h + ${SRCDIR}/Texture.h ${SRCDIR}/Text.h ${SRCDIR}/Weapons.h ${SRCDIR}/Input.h @@ -107,13 +109,13 @@ set(LUGARU_H ${SRCDIR}/openal_wrapper.h ${SRCDIR}/gamegl.h ${SRCDIR}/glstubs.h - ${SRCDIR}/mmgr.h - ${SRCDIR}/nommgr.h - ${SRCDIR}/pack_private.h ${SRCDIR}/private.h - ${SRCDIR}/unpack_private.h ${SRCDIR}/Settings.h ${SRCDIR}/Stereo.h + ${SRCDIR}/Animation.h + ${SRCDIR}/Animation.def + ${SRCDIR}/Sounds.h + ${SRCDIR}/Sounds.def ) if(UNIX) @@ -496,7 +498,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)