diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-22 18:19:53 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-03-22 19:17:08 +0100 |
| commit | 4a30800cf16d403a7c25d78388e2822aa396ac86 (patch) | |
| tree | 772753228bab7b0b4ba47e89580ed86de0ca098f /test/unit | |
| parent | 1406464f0ce0b804298e2ee034bdd8bc7856e0dc (diff) | |
| download | colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.tar.gz colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.tar.bz2 colobot-4a30800cf16d403a7c25d78388e2822aa396ac86.zip | |
Fixes for compiling on MSYS
* fixed SDL_main() and putenv() issues
* disabled desktop subdir for MSYS
* disabled building CBot_console for now
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/CMakeLists.txt | 33 | ||||
| -rw-r--r-- | test/unit/common/image_test.cpp | 2 |
2 files changed, 21 insertions, 14 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 34027b8..f3be01d 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -158,15 +158,8 @@ endif() set(OPTIONAL_LIBS "") if (${OPENAL_SOUND}) - if (${PLATFORM_WINDOWS}) - set(OPTIONAL_LIBS - OpenAL32 - ) - else() - set(OPTIONAL_LIBS - openal - ) - endif() + set(OPTIONAL_LIBS ${OPENAL_LIBRARY}) + set(OPTIONAL_INCLUDES ${OPENAL_INCLUDE_DIR}) endif() @@ -189,14 +182,28 @@ math/vector_test.cpp ${PLATFORM_TESTS} ) +# Local include_directories( -${CMAKE_CURRENT_BINARY_DIR} -${SRC_DIR} -${GTEST_INCLUDE_DIR} -${GMOCK_INCLUDE_DIR} . common math +${SRC_DIR} +${CMAKE_CURRENT_BINARY_DIR} +) + +# System +include_directories( +SYSTEM +${GTEST_INCLUDE_DIR} +${GMOCK_INCLUDE_DIR} +${SDL_INCLUDE_DIR} +${SDLIMAGE_INCLUDE_DIR} +${SDLTTF_INCLUDE_DIR} +${PNG_INCLUDE_DIRS} +${GLEW_INCLUDE_PATH} +${Boost_INCLUDE_DIRS} +${OPTIONAL_INCLUDE_DIRS} +${LIBSNDFILE_INCLUDE_DIR} ) set(LIBS diff --git a/test/unit/common/image_test.cpp b/test/unit/common/image_test.cpp index 2a8d5e4..2b20a17 100644 --- a/test/unit/common/image_test.cpp +++ b/test/unit/common/image_test.cpp @@ -1,6 +1,6 @@ #include "common/image.h" -#include <SDL/SDL.h> +#include <SDL.h> #include <stdio.h> /* For now, just a simple test: loading a file from image |