diff --git a/.gitignore b/.gitignore index c41b49b..3ae2d74 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ build cmake-build-* .DS_store +*.AppImage +appdir diff --git a/.travis.yml b/.travis.yml index b4aa069..2b06836 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,16 @@ matrix: - libavcodec-dev env: - CMAKE_PREFIX_PATH="/opt/qt512" + - CMAKE_EXTRA_ARGS="-DCMAKE_INSTALL_PREFIX=/usr" + after_success: + - make install DESTDIR=../appdir + - cd .. + - wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-x86_64.AppImage && chmod +x linuxdeploy-x86_64.AppImage + - wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage && chmod +x linuxdeploy-plugin-qt-x86_64.AppImage + #- export QMAKE=/opt/qt512/bin/qmake + - source /opt/qt512/bin/qt512-env.sh + - ./linuxdeploy-x86_64.AppImage --appdir=appdir -e appdir/usr/bin/chiaki -d appdir/usr/share/applications/chiaki.desktop --plugin qt --output appimage + - mv Chiaki-*-x86_64.AppImage Chiaki-x86_64.AppImage - os: osx osx_image: xcode11 @@ -34,6 +44,7 @@ matrix: - ffmpeg env: - CMAKE_PREFIX_PATH="/usr/local/opt/openssl@1.1;/usr/local/opt/qt" + - CMAKE_EXTRA_ARGS="" script: - mkdir build && cd build @@ -43,6 +54,7 @@ script: -DCHIAKI_ENABLE_TESTS=ON -DCHIAKI_ENABLE_CLI=OFF -DCHIAKI_GUI_ENABLE_QT_GAMEPAD=ON + $CMAKE_EXTRA_ARGS .. - make -j4 - test/chiaki-unit diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index d22555e..53a40e4 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -75,4 +75,10 @@ set_target_properties(chiaki PROPERTIES MACOSX_BUNDLE_COPYRIGHT "thestr4ng3r (GPLv3)" MACOSX_BUNDLE_GUI_IDENTIFIER "org.chiaki.chiaki" MACOSX_BUNDLE_ICON_FILE chiaki.icns - RESOURCE "${RESOURCE_FILES}") \ No newline at end of file + RESOURCE "${RESOURCE_FILES}") + +install(TARGETS chiaki + RUNTIME DESTINATION bin + BUNDLE DESTINATION bin) +install(FILES chiaki.desktop DESTINATION share/applications) +install(FILES chiaki.png DESTINATION share/icons/hicolor/512x512) \ No newline at end of file diff --git a/gui/chiaki.desktop b/gui/chiaki.desktop new file mode 100644 index 0000000..6ee0326 --- /dev/null +++ b/gui/chiaki.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Chiaki +Comment=PlayStation 4 Remote Play Client +Exec=chiaki +Icon=chiaki +Categories=Game; \ No newline at end of file diff --git a/gui/chiaki.png b/gui/chiaki.png new file mode 100644 index 0000000..3ec23ab Binary files /dev/null and b/gui/chiaki.png differ diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index e3db221..b1357d5 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -5,7 +5,7 @@ find_package(PythonInterp 3 REQUIRED) # Make sure nanopb doesn't find Python 2.7 because Python 2 should just die. -add_subdirectory(nanopb) +add_subdirectory(nanopb EXCLUDE_FROM_ALL) set(NANOPB_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/nanopb") set(NANOPB_SOURCE_DIR "${NANOPB_SOURCE_DIR}" PARENT_SCOPE) set(NANOPB_GENERATOR_PY "${NANOPB_SOURCE_DIR}/generator/nanopb_generator.py" PARENT_SCOPE)