diff options
| -rw-r--r-- | .gitignore | 20 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CBot/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/graphics/core/device.h | 2 |
5 files changed, 22 insertions, 6 deletions
@@ -1,9 +1,19 @@ # Ignore the documentation folder /doc -# Ignore the CMake build files -/CMakeFiles -/CMakeCache.txt -/cmake_install.cmake -/Makefile +# We don't want anyone to checkin /data folder +/data + +# Ignore local data +/colobot.ini +/savegame +# Ignore the CMake build files +CMakeFiles +CMakeCache.txt +cmake_install.cmake +Makefile +/install_manifest.txt +/Testing +/CTestTestfile.cmake +/src/CBot/tests/CBot_console/bin/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1353250..660c79f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,3 +131,5 @@ endif() # Subdirectory with sources add_subdirectory(src bin) + +INSTALL_FILES(/share/games/colobot ../data) diff --git a/src/CBot/CMakeLists.txt b/src/CBot/CMakeLists.txt index 9f5b987..271f2ce 100644 --- a/src/CBot/CMakeLists.txt +++ b/src/CBot/CMakeLists.txt @@ -17,3 +17,5 @@ if(${CBOT_STATIC}) else() add_library(CBot SHARED ${SOURCES}) endif() + +INSTALL_TARGETS(/lib CBot) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a7f1c96..c8372b0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -192,3 +192,5 @@ link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot) add_executable(colobot ${SOURCES}) target_link_libraries(colobot ${LIBS}) + +INSTALL_TARGETS(/games colobot) diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h index ba5af6e..b6dd138 100644 --- a/src/graphics/core/device.h +++ b/src/graphics/core/device.h @@ -72,7 +72,7 @@ struct DeviceConfig size = Math::IntPoint(800, 600); bpp = 32; fullScreen = false; - resizeable = true; + resizeable = false; doubleBuf = true; noFrame = false; } |