diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-16 19:17:26 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-16 19:17:26 +0200 |
commit | 68a7bafe37adef0e5ef12c2d0e8461a21e05363b (patch) | |
tree | f0185e459ea0c5638fca7bada5f2e440fd9eda51 /src/graphics/opengl/test/CMakeLists.txt | |
parent | 54f4da87923465a5387e2e854b58616647deb7af (diff) | |
download | colobot-68a7bafe37adef0e5ef12c2d0e8461a21e05363b.tar.gz colobot-68a7bafe37adef0e5ef12c2d0e8461a21e05363b.tar.bz2 colobot-68a7bafe37adef0e5ef12c2d0e8461a21e05363b.zip |
Fixes in texture loading
- added other texture formats: BGR and BGRA
- fixed texture loading in model viewer
- moved code from texture.cpp module to texture.h
Diffstat (limited to 'src/graphics/opengl/test/CMakeLists.txt')
-rw-r--r-- | src/graphics/opengl/test/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/graphics/opengl/test/CMakeLists.txt b/src/graphics/opengl/test/CMakeLists.txt index 36bd738..4242c77 100644 --- a/src/graphics/opengl/test/CMakeLists.txt +++ b/src/graphics/opengl/test/CMakeLists.txt @@ -8,6 +8,8 @@ find_package(PNG REQUIRED) set(CMAKE_BUILD_TYPE debug) set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0") +set(ADD_LIBS "") + if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(PLATFORM_WINDOWS 1) set(PLATFORM_LINUX 0) @@ -16,6 +18,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(PLATFORM_WINDOWS 0) set(PLATFORM_LINUX 1) set(PLATFORM_OTHER 0) + set(ADD_LIBS "-lrt") else() set(PLATFORM_WINDOWS 0) set(PLATFORM_LINUX 0) @@ -28,7 +31,6 @@ configure_file(../../../common/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/common set(TEXTURE_SOURCES ../gldevice.cpp ../../common/device.cpp -../../common/texture.cpp ../../../common/logger.cpp ../../../common/image.cpp texture_test.cpp @@ -38,7 +40,6 @@ set(MODEL_SOURCES ../gldevice.cpp ../../common/device.cpp ../../common/modelfile.cpp -../../common/texture.cpp ../../../common/logger.cpp ../../../common/image.cpp ../../../common/iman.cpp @@ -54,6 +55,7 @@ ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${OPENGL_LIBRARY} ${PNG_LIBRARIES} +${ADD_LIBS} ) add_executable(texture_test ${TEXTURE_SOURCES}) |