diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml index fb2d063..40c69da 100644 --- a/.github/workflows/windows-msys2.yml +++ b/.github/workflows/windows-msys2.yml @@ -16,7 +16,7 @@ jobs: msystem: MINGW64 update: true pacboy: >- - toolchain:p ninja:p cmake:p + toolchain:p ninja:p cmake:p extra-cmake-modules:p qt5-static:p bison: flex: - name: Build run: | @@ -29,7 +29,7 @@ jobs: run: | mkdir package_workspace && cd package_workspace cp ../build/thplayer.exe ./ - strip -S ./thplayer.exe + strip -s ./thplayer.exe # windeployqt -winextras --no-quick-import --no-translations --no-opengl-sw --no-angle --no-system-d3d-compiler ./thplayer.exe ldd ./thplayer.exe > deps.txt bash -c 'while read -r line; do path=$(cut -d" " -f3 <<<$line); cp -v $path ./; done <<<$(grep ".*mingw.*bin" deps.txt); exit 0' diff --git a/CMakeLists.txt b/CMakeLists.txt index d3792da..4780b87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14.0) +cmake_minimum_required(VERSION 3.16.0) project(thplayer CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -11,13 +11,19 @@ add_subdirectory(thtk EXCLUDE_FROM_ALL) target_include_directories(thtk PUBLIC thtk/) find_package(Qt5 REQUIRED COMPONENTS Widgets Multimedia) +find_package(ECM 5.83.0 NO_MODULE) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) -INCLUDE (CheckTypeSize) +include(CheckTypeSize) + +if(ECM_FOUND) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + include(ECMAddAppIcon) +endif() SET(CMAKE_EXTRA_INCLUDE_FILES "filesystem") check_type_size("std::filesystem::path::value_type" PATH_VALSIZE LANGUAGE CXX) @@ -39,6 +45,14 @@ add_executable(thplayer res.qrc ) +if(ECM_FOUND) + ecm_add_app_icon(thplayer + ICONS + assets/256-thplayer.png + assets/thplayer.svg + ) +endif() + add_dependencies(thplayer thtk) get_property(thtk_bindir DIRECTORY thtk/ PROPERTY BINARY_DIR) diff --git a/README.md b/README.md index 35d85ff..5ba6303 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TouHou Player -[![Build status](https://ci.appveyor.com/api/projects/status/3hnd8quh22grg4gv/branch/master?svg=true)](https://ci.appveyor.com/project/BLumia/thplayer/branch/master) +[![Linux Build](https://github.com/BearKidsTeam/thplayer/actions/workflows/linux.yml/badge.svg)](https://github.com/BearKidsTeam/thplayer/actions/workflows/linux.yml) [![Windows MSYS2 Build](https://github.com/BearKidsTeam/thplayer/actions/workflows/windows-msys2.yml/badge.svg)](https://github.com/BearKidsTeam/thplayer/actions/workflows/windows-msys2.yml) [![macOS Build](https://github.com/BearKidsTeam/thplayer/actions/workflows/macos.yml/badge.svg)](https://github.com/BearKidsTeam/thplayer/actions/workflows/macos.yml) [Website](https://bearkidsteam.github.io/thplayer/) diff --git a/assets/thplayer.png b/assets/256-thplayer.png similarity index 100% rename from assets/thplayer.png rename to assets/256-thplayer.png