github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-14 02:36:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable Setsu in AppImage

Browse source
This commit is contained in:
Florian Märkl 2021-01-15 21:14:37 +01:00
commit 505910bc5f
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/Dockerfile.xenial
View file

@ -5,9 +5,9 @@ RUN apt-get update
RUN apt-get install -y software-properties-common RUN apt-get install -y software-properties-common
RUN add-apt-repository ppa:beineri/opt-qt-5.12.3-xenial RUN add-apt-repository ppa:beineri/opt-qt-5.12.3-xenial
RUN apt-get update RUN apt-get update
RUN apt-get -y install git g++ cmake ninja-build curl unzip python3-pip \ RUN apt-get -y install git g++ cmake ninja-build curl pkg-config unzip python3-pip \
libssl-dev libopus-dev qt512base qt512multimedia qt512svg \ libssl-dev libopus-dev qt512base qt512multimedia qt512svg \
libgl1-mesa-dev nasm libudev-dev libva-dev fuse libgl1-mesa-dev nasm libudev-dev libva-dev fuse libevdev-dev libudev-dev
CMD [] CMD []

2
scripts/build-appimage.sh
View file

@ -18,6 +18,8 @@ cmake \
"-DCMAKE_PREFIX_PATH=`pwd`/../appimage/ffmpeg-prefix;`pwd`/../appimage/sdl2-prefix;/opt/qt512" \ "-DCMAKE_PREFIX_PATH=`pwd`/../appimage/ffmpeg-prefix;`pwd`/../appimage/sdl2-prefix;/opt/qt512" \
-DCHIAKI_ENABLE_TESTS=ON \ -DCHIAKI_ENABLE_TESTS=ON \
-DCHIAKI_ENABLE_CLI=OFF \ -DCHIAKI_ENABLE_CLI=OFF \
-DCHIAKI_ENABLE_GUI=ON \
-DCHIAKI_ENABLE_SETSU=ON \
-DCHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER=ON \ -DCHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER=ON \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
.. ..

4
setsu/cmake/FindEvdev.cmake
View file

@ -5,7 +5,11 @@ set(_target "${_prefix}::libevdev")
find_package(PkgConfig) find_package(PkgConfig)
if(PkgConfig_FOUND AND NOT TARGET ${_target}) if(PkgConfig_FOUND AND NOT TARGET ${_target})
if(CMAKE_VERSION VERSION_LESS "3.6")
pkg_check_modules("${_prefix}" libevdev)
else()
pkg_check_modules("${_prefix}" libevdev IMPORTED_TARGET) pkg_check_modules("${_prefix}" libevdev IMPORTED_TARGET)
endif()
if((TARGET PkgConfig::${_prefix}) AND (NOT CMAKE_VERSION VERSION_LESS "3.11.0")) if((TARGET PkgConfig::${_prefix}) AND (NOT CMAKE_VERSION VERSION_LESS "3.11.0"))
set_target_properties(PkgConfig::${_prefix} PROPERTIES IMPORTED_GLOBAL ON) set_target_properties(PkgConfig::${_prefix} PROPERTIES IMPORTED_GLOBAL ON)
add_library(${_target} ALIAS PkgConfig::${_prefix}) add_library(${_target} ALIAS PkgConfig::${_prefix})

4
setsu/cmake/FindUdev.cmake
View file

@ -5,7 +5,11 @@ set(_target "${_prefix}::libudev")
find_package(PkgConfig) find_package(PkgConfig)
if(PkgConfig_FOUND AND NOT TARGET ${_target}) if(PkgConfig_FOUND AND NOT TARGET ${_target})
if(CMAKE_VERSION VERSION_LESS "3.6")
pkg_check_modules("${_prefix}" libudev)
else()
pkg_check_modules("${_prefix}" libudev IMPORTED_TARGET) pkg_check_modules("${_prefix}" libudev IMPORTED_TARGET)
endif()
if((TARGET PkgConfig::${_prefix}) AND (NOT CMAKE_VERSION VERSION_LESS "3.11.0")) if((TARGET PkgConfig::${_prefix}) AND (NOT CMAKE_VERSION VERSION_LESS "3.11.0"))
set_target_properties(PkgConfig::${_prefix} PROPERTIES IMPORTED_GLOBAL ON) set_target_properties(PkgConfig::${_prefix} PROPERTIES IMPORTED_GLOBAL ON)
add_library(${_target} ALIAS PkgConfig::${_prefix}) add_library(${_target} ALIAS PkgConfig::${_prefix})