diff options
| author | erihel <erihel@gmail.com> | 2013-04-11 13:37:15 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-04-11 13:37:15 +0200 |
| commit | 01309c8bd0a9ac4476952ec5063499ec980a7b12 (patch) | |
| tree | c594cc79fa1c27e13cbe37ef9b1711b4719c3933 /test | |
| parent | 99d386b61a29e6f8cadf2f91019017736c681f00 (diff) | |
| download | colobot-01309c8bd0a9ac4476952ec5063499ec980a7b12.tar.gz colobot-01309c8bd0a9ac4476952ec5063499ec980a7b12.tar.bz2 colobot-01309c8bd0a9ac4476952ec5063499ec980a7b12.zip | |
* Added clipboard support (issue #60)
* Fixed keyboard shortcuts while code editing in game
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/unit/ui/CMakeLists.txt | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 7f78a35..7ad7afd 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -204,6 +204,7 @@ ${GLEW_INCLUDE_PATH} ${Boost_INCLUDE_DIRS} ${OPTIONAL_INCLUDE_DIRS} ${LIBSNDFILE_INCLUDE_DIR} +${CLIPBOARD_DIR} ) set(LIBS @@ -220,6 +221,7 @@ ${Boost_LIBRARIES} ${OPTIONAL_LIBS} ${PLATFORM_LIBS} ${LIBSNDFILE_LIBRARY} +clipboard ) add_executable(colobot_ut ${COLOBOT_SOURCES} ${UT_SOURCES} ${OPENAL_SOURCES}) diff --git a/test/unit/ui/CMakeLists.txt b/test/unit/ui/CMakeLists.txt index c899834..041d4a1 100644 --- a/test/unit/ui/CMakeLists.txt +++ b/test/unit/ui/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( ${SRC_DIR} ${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} +${CLIPBOARD_DIR} ) # Platform-dependent implementation of CSystemUtils @@ -12,8 +13,10 @@ if (${PLATFORM_WINDOWS}) set(SYSTEM_CPP_MODULE "system_windows.cpp") elseif(${PLATFORM_LINUX}) set(SYSTEM_CPP_MODULE "system_linux.cpp") + set(ADDITIONAL_LIB X11) else() set(SYSTEM_CPP_MODULE "system_other.cpp") + set(ADDITIONAL_LIB X11) endif() add_executable(edit_test @@ -36,6 +39,9 @@ stubs/particle_stub.cpp stubs/restext_stub.cpp stubs/robotmain_stub.cpp edit_test.cpp) -target_link_libraries(edit_test gtest gmock ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES}) + +target_link_libraries(edit_test gtest gmock ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES} ${ADDITIONAL_LIB} clipboard) + + add_test(edit_test ./edit_test) |