X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=CMakeLists.txt;h=8fe8a8e665118af8d818d1143e446cb71e194a8a;hb=fa9b4636af8985a9e1574d6e08ac77e47eb72fe2;hp=29f70ebc0d75c3ce11e49e4de5b16194790445d3;hpb=1cd298a004e19319fef1928e58d2e5b626e48027;p=lugaru.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 29f70eb..8fe8a8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") set(LUGARU_SRCS ${SRCDIR}/Frustum.cpp ${SRCDIR}/Account.cpp + ${SRCDIR}/ConsoleCmds.cpp ${SRCDIR}/Game.cpp ${SRCDIR}/GameDraw.cpp ${SRCDIR}/GameInitDispose.cpp @@ -53,7 +54,7 @@ set(LUGARU_SRCS ${SRCDIR}/Terrain.cpp ${SRCDIR}/Texture.cpp ${SRCDIR}/Text.cpp - ${SRCDIR}/TGALoader.cpp + ${SRCDIR}/ImageIO.cpp ${SRCDIR}/unpack.c ${SRCDIR}/Weapons.cpp ${SRCDIR}/OpenGL_Windows.cpp @@ -69,6 +70,7 @@ set(LUGARU_SRCS set(LUGARU_H ${SRCDIR}/Frustum.h ${SRCDIR}/Account.h + ${SRCDIR}/ConsoleCmds.h ${SRCDIR}/Game.h ${SRCDIR}/Lights.h ${SRCDIR}/Menu.h @@ -81,13 +83,12 @@ set(LUGARU_H ${SRCDIR}/Skeleton.h ${SRCDIR}/Skybox.h ${SRCDIR}/Sprite.h - ${SRCDIR}/TGALoader.h + ${SRCDIR}/ImageIO.h ${SRCDIR}/Terrain.h ${SRCDIR}/Texture.h ${SRCDIR}/Text.h ${SRCDIR}/Weapons.h ${SRCDIR}/Input.h - ${SRCDIR}/alstubs.h ${SRCDIR}/binio.h ${SRCDIR}/openal_wrapper.h ${SRCDIR}/gamegl.h @@ -179,13 +180,13 @@ endif(WIN32) target_link_libraries(lugaru ${LUGARU_LIBS}) if(WIN32) - add_definitions(-DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=) + add_definitions(-DBinIO_STDINT_HEADER=) if(MINGW) # An alternative would be to use _WIN32 consistently instead of WIN32 add_definitions(-DWIN32) endif(MINGW) else(WIN32) - add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DUSE_OPENAL=1 -DUSE_SDL=1 -DBinIO_STDINT_HEADER=) + add_definitions(-DPLATFORM_LINUX=1 -DPLATFORM_UNIX=1 -DBinIO_STDINT_HEADER=) endif(WIN32)