X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=4775a5ec9eeb1a6d75139967d163090259844df7;hb=2ff81b0a43f256cb92f04ced2bc415eae11459ca;hp=d86c839cc3066e8317dba38886c40fe9d28f46fe;hpb=705156dced26432e41deada8d9811c05d52b44ce;p=lugaru.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d86c839..4775a5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,11 +62,9 @@ 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 - ${SRCDIR}/Random.c ${SRCDIR}/Skeleton.cpp ${SRCDIR}/Skybox.cpp ${SRCDIR}/Sprite.cpp @@ -74,17 +72,18 @@ set(LUGARU_SRCS ${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 @@ -108,13 +107,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) @@ -497,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)