Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
961ad69
Merge pull request #191 from KatsutoshiOtogawa/master
Grumbel Sep 4, 2022
71eba5c
Fix missing <functional> includes
Grumbel Mar 23, 2023
c675418
Update flake.nix to nixos-22.11
Grumbel Mar 23, 2023
d49fda4
Fix struct/class mixup in forward declaration
Grumbel Mar 23, 2023
1379bb0
Update flake.nix to nixos-23.05
Grumbel May 24, 2023
28514df
Update priocpp to remove jsoncpp dependency
Grumbel Jun 14, 2023
1d7f142
Remove .gitlab-ci.yml
Grumbel Jun 14, 2023
68ea534
Rename COPYING to LICENSE.txt and update it (http -> https)
Grumbel Aug 13, 2023
fb56c36
Remove outdated MacOSX build files
Grumbel Aug 13, 2023
286412f
Remove outdated .travis.yml
Grumbel Aug 13, 2023
cc82ba6
Remove outdated flatpak information
Grumbel Aug 13, 2023
2131a2b
Change URLs from gitlab to github
Grumbel Aug 13, 2023
9b05d35
Remove pingus.appdata.xml
Grumbel Sep 13, 2023
0af3c96
gitlab -> github
Grumbel Sep 25, 2023
d0aac93
Update to NixOS 23.11
Grumbel Dec 4, 2023
fc25d2b
Update README/INSTALL to point to Nix
Grumbel Apr 2, 2024
7c268df
Remove git submodules, use Nix instead
Grumbel Apr 2, 2024
af52203
Update flake.lock to fix Win32 build issue
Grumbel Apr 2, 2024
c0a141f
Fix missing include
Grumbel May 26, 2024
8c68e08
Update to nixos-24.05
Grumbel May 26, 2024
be9148d
Update gl.po
ninjum Jul 4, 2024
764ed7c
Update gl.po
ninjum Nov 10, 2024
58613e7
Remove mesa wrapper
Grumbel Jul 21, 2025
76a8ea5
Update to fmt-10
Grumbel Jul 21, 2025
4df47be
Update to nixos-25.05
Grumbel Jul 21, 2025
b0ceeee
Fix Win32 build
Grumbel Jul 21, 2025
25e14fb
Limit pingus-win32 packages to Windows platforms
Grumbel Jul 23, 2025
19c8a2e
Merge branch 'Pingus:master' into master
ninjum Aug 26, 2025
2b09d8d
Update to nixos-25.11
Grumbel Oct 18, 2025
41bfd8b
Fix 'system has been renamed' warning
Grumbel Nov 19, 2025
bf46ab7
Fix targetPlatform/hostPlatform mixup
Grumbel Nov 27, 2025
7d65221
Update dependencies
Grumbel Nov 28, 2025
6bb3ab7
Handle sexp-cpp in flake.nix
Grumbel Apr 9, 2026
4314847
Fix unstable narHashes via git+https://
Grumbel Apr 9, 2026
6634163
Merge branch 'Pingus:master' into master
ninjum May 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 0 additions & 131 deletions .gitlab-ci.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .gitmodules

This file was deleted.

100 changes: 0 additions & 100 deletions .travis.yml

This file was deleted.

24 changes: 8 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,24 @@ project(pingus VERSION 0.8.0)

include(mk/cmake/TinyCMMC.cmake)

# FIXME: Move this into GetProjectVersion, get date from git
string(TIMESTAMP PROJECT_DATE "%Y-%m-%d" UTC)

find_package(PkgConfig REQUIRED)
set(OpenGL_GL_PREFERENCE "LEGACY")
find_package(OpenGL REQUIRED)
pkg_search_module(SDL2 REQUIRED sdl2 IMPORTED_TARGET)
pkg_search_module(SDL2IMAGE REQUIRED SDL2_image>=2.0.0 IMPORTED_TARGET)
pkg_search_module(PNG REQUIRED libpng IMPORTED_TARGET)
pkg_search_module(JSONCPP REQUIRED jsoncpp IMPORTED_TARGET)
pkg_search_module(SIGCXX REQUIRED sigc++-2.0 IMPORTED_TARGET)
find_package(fmt REQUIRED)
find_package(glm REQUIRED)

if (BUILD_TESTS)
if(WIN32)
# Fix for this issue:
# include/mcfgthread/fwd.h:24:4: error:
# #error Please define _WIN32_WINNT to at least Windows 7.
add_definitions(-D_WIN32_WINNT=0x0601)
endif()

if(BUILD_TESTS)
# add 'make test' target, use 'make test ARGS="-V"' or 'ctest -V' for verbose
enable_testing()
endif(BUILD_TESTS)
Expand Down Expand Up @@ -104,7 +107,6 @@ target_link_libraries(libpingus PUBLIC
PkgConfig::SDL2
PkgConfig::SDL2IMAGE
PkgConfig::PNG
PkgConfig::JSONCPP
PkgConfig::SIGCXX
OpenGL::GL)

Expand Down Expand Up @@ -210,14 +212,4 @@ install(FILES
install(DIRECTORY data/icons/
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons)

configure_file(pingus.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/pingus.appdata.xml)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pingus.appdata.xml
DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)

if (BUILD_TESTS)
add_test(NAME pingus.appdata.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND appstream-util validate-relax ${CMAKE_CURRENT_BINARY_DIR}/pingus.appdata.xml)
endif(BUILD_TESTS)

# EOF #
Loading