Merge branch 'master' of https://github.com/cxong/cdogs-sdl

.github/workflows/cmake.yml

@@ -11,7 +11,7 @@ on:
     types: [published, created, edited]
 
 env:
-  VERSION: 2.1.0
+  VERSION: 2.2.0
   CTEST_EXT_COLOR_OUTPUT: TRUE
   CTEST_OUTPUT_ON_FAILURE: 1
   CTEST_BUILD_FLAGS: -j4

.gitignore

@@ -26,6 +26,7 @@ install_manifest_Runtime.txt
 __pycache__/
 .cmake/
 compile_commands.json
+*.build/
 
 # Generated files
 src/cdogs/sys_config.h

CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
 project(cdogs-sdl C)
 
 set(VERSION_MAJOR "2")
-set(VERSION_MINOR "1")
+set(VERSION_MINOR "2")
 set(VERSION_PATCH "0")
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
@@ -238,7 +238,7 @@ install(FILES
 if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
 	install(FILES ${CMAKE_SOURCE_DIR}/build/linux/io.github.cxong.cdogs-sdl.desktop DESTINATION ${INSTALL_PREFIX}/share/applications)
 	install(FILES ${CMAKE_SOURCE_DIR}/build/linux/io.github.cxong.cdogs-sdl.appdata.xml DESTINATION ${INSTALL_PREFIX}/share/metainfo)
-	foreach(RES 16 22 32 48 128)
+	foreach(RES 16 22 32 48 64 128 256)
 		install(FILES ${CMAKE_SOURCE_DIR}/build/linux/cdogs-icon.${RES}.png
 			DESTINATION ${INSTALL_PREFIX}/share/icons/hicolor/${RES}x${RES}/apps
 			RENAME io.github.cxong.cdogs-sdl.png)

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.1.0.{build}
+version: 2.2.0.{build}
 
 branches:
   only:
@@ -19,7 +19,7 @@ environment:
   SDL2_IMAGE_VERSION: 2.8.1
   SDL2_MIXER_VERSION: 2.6.3
   SDLDIR: C:\projects\cdogs-sdl
-  VERSION: 2.1.0
+  VERSION: 2.2.0
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

build/linux/io.github.cxong.cdogs-sdl.appdata.xml

@@ -50,6 +50,7 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="2.2.0" date="2024-12-07"/>
     <release version="2.1.0" date="2024-04-12"/>
     <release version="2.0.0" date="2024-02-17"/>
     <release version="1.5.0" date="2023-07-28"/>