Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/cxong/cdogs-sdl
Browse files Browse the repository at this point in the history
Hrvt2 committed Dec 5, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
foolnotion Bogdan Burlacu
2 parents f5e3a33 + 4992b43 commit 228610e
Showing 42 changed files with 970 additions and 127 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ install_manifest_Runtime.txt
__pycache__/
.cmake/
compile_commands.json
*.build/

# Generated files
src/cdogs/sys_config.h
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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%"
Binary file modified build/linux/cdogs-icon.128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/linux/cdogs-icon.16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/linux/cdogs-icon.22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/linux/cdogs-icon.256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/linux/cdogs-icon.32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/linux/cdogs-icon.48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/linux/cdogs-icon.64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions build/linux/io.github.cxong.cdogs-sdl.appdata.xml
Original file line number Diff line number Diff line change
@@ -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"/>
Binary file modified build/macosx/cdogs-icon.icns
Binary file not shown.
Binary file modified build/windows/cdogs-icon.ico
Binary file not shown.
Loading

0 comments on commit 228610e

Please sign in to comment.