bunch of fixes

Author: Motobug

.github/workflows/ci.yml

@@ -251,7 +251,7 @@ jobs:
         mkdir -p "$HOME/.ccache"
         mkdir build
         cd build
-        cmake .. -GNinja -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc-13 -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++-13 -DCMAKE_PREFIX_PATH="${{github.workspace}}/qt/${{ env.yaqti }}/gcc_64/" -Ddatadir:PATH="share/dolphin-emu" -DBIN_INSTALL_DIR="install/usr/bin" -DCMAKE_INSTALL_PREFIX="install/usr" -DINC_INSTALL_DIR="install/usr/include" -DLIB_INSTALL_DIR="install/usr/lib" -DPKGCONFIG_INSTALL_DIR="install/usr/lib/pkgconfig" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DENABLE_NOGUI=OFF
+        cmake .. -GNinja -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc-13 -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++-13 -DCMAKE_PREFIX_PATH="${{github.workspace}}/qt/${{ env.yaqti }}/gcc_64/" -Ddatadir:PATH="share/project-plus-dolphin" -DBIN_INSTALL_DIR="install/usr/bin" -DCMAKE_INSTALL_PREFIX="install/usr" -DINC_INSTALL_DIR="install/usr/include" -DLIB_INSTALL_DIR="install/usr/lib" -DPKGCONFIG_INSTALL_DIR="install/usr/lib/pkgconfig" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DENABLE_NOGUI=OFF
         ninja
     - name: Install Dolphin
       run: |
@@ -260,7 +260,7 @@ jobs:
     - name: Package Dolphin-Binary
       run: |
         mkdir -p $GITHUB_WORKSPACE/{artifacts,uploads}
-        cp -P build/install/usr/bin/dolphin-emu $GITHUB_WORKSPACE/artifacts
+        cp -P build/install/usr/bin/project-plus-dolphin $GITHUB_WORKSPACE/artifacts
     - name: Package Dolphin-AppImage
       env:
         QT_BASE_DIR: /qt/${{ env.yaqti }}/gcc_64
@@ -284,7 +284,7 @@ jobs:
         cd $GITHUB_WORKSPACE
         mkdir -p squashfs-root
         cp -a build/install/usr $GITHUB_WORKSPACE/squashfs-root/
-        cp Data/dolphin-emu.svg ./squashfs-root/dolphin-emu.svg
+        cp Data/project-plus-dolphin.svg ./squashfs-root/project-plus-dolphin.svg
         cp Data/project-plus-dolphin.desktop ./squashfs-root/project-plus-dolphin.desktop
         curl -sSfL https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-x86_64 -o ./squashfs-root/runtime
         curl -sSfL "https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/AppRun-patched-x86_64" -o ./squashfs-root/AppRun-patched
@@ -296,7 +296,7 @@ jobs:
         chmod a+x ./squashfs-root/AppRun-patched
         chmod a+x ./squashfs-root/update.sh
         export UPD_INFO="gh-releases-zsync|Motobug|Project-Plus-Dolphin|continuous|Project+_Dolphin-x86_64.AppImage.zsync"
-        /tmp/squashfs-root/AppRun --appdir="$GITHUB_WORKSPACE"/squashfs-root/ --plugin qt -d "$GITHUB_WORKSPACE"/squashfs-root/project-plus-dolphin.desktop -i "$GITHUB_WORKSPACE"/squashfs-root/dolphin-emu.svg \
+        /tmp/squashfs-root/AppRun --appdir="$GITHUB_WORKSPACE"/squashfs-root/ --plugin qt -d "$GITHUB_WORKSPACE"/squashfs-root/project-plus-dolphin.desktop -i "$GITHUB_WORKSPACE"/squashfs-root/project-plus-dolphin.svg \
         --exclude-library=libglib* --output appimage
         ls . | grep *.AppImage
         mv $(ls . | grep *.AppImage) $GITHUB_WORKSPACE/artifacts

BuildLinuxAppImage.sh

@@ -30,7 +30,7 @@ rm ./AppDir/usr/bin/dolphin-emu-nogui
 rm ./AppDir/usr/bin/dolphin-tool
 mv ./AppDir/usr/share/dolphin-emu/sys ./AppDir/usr/bin/Sys
 rm -rf ./AppDir/usr/share/dolphin-emu
-sed -i 's/env QT_QPA_PLATFORM=xcb dolphin-emu/dolphin-emu/g' ./AppDir/usr/share/applications/dolphin-emu.desktop
+sed -i 's/env QT_QPA_PLATFORM=xcb dolphin-emu/dolphin-emu/g' ./AppDir/usr/share/applications/project-plus-dolphin.desktop
 
 # Prepare Tools for building the AppImage
 wget -N https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${ARCH}.AppImage

CMakeLists.txt

@@ -28,7 +28,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0.0" CACHE STRING "")
 
 set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/CMake/FlagsOverride.cmake")
 
-project(dolphin-emu)
+project(project-plus-dolphin)
 
 if (MSVC)
   if (POLICY CMP0117)
@@ -177,7 +177,7 @@ include(RemoveCompileFlag)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # Set up paths
-set(datadir ${CMAKE_INSTALL_FULL_DATADIR}/dolphin-emu CACHE PATH "datadir")
+set(datadir ${CMAKE_INSTALL_FULL_DATADIR}/project-plus-dolphin CACHE PATH "datadir")
 add_definitions(-DDATA_DIR="${datadir}/")
 
 if(CMAKE_SYSROOT)
@@ -861,16 +861,10 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD|Darwin")
 endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD")
   # Install the application icon and menu item
-  install(FILES Data/dolphin-emu.svg
-          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
-  install(FILES Data/dolphin-emu.png
-          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
   install(FILES Data/project-plus-dolphin.svg
           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
   install(FILES Data/project-plus-dolphin.png
 		  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
-  install(FILES Data/dolphin-emu.desktop
-		  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
   install(FILES Data/project-plus-dolphin.desktop
           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
   # Install manpages

Data/dolphin-emu.png

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/dolphin-emu.svg $HOME/.local/share/icons/hicolor/scalable/apps
-mkdir -p $HOME/.local/share/dolphin-emu && cp -R $APPDIR/usr/share/dolphin-emu $HOME/.local/share/
+mkdir -p $HOME/.local/share/project-plus-dolphin && cp -R $APPDIR/usr/share/project-plus-dolphin $HOME/.local/share/
 
-GITVER=$(wget -qO- https://www.github.com/qurious-pixel/dolphin/releases/tag/continuous | grep '<p>DOLPHIN' | awk '{print $NF}' | cut -d '<' -f 1)
+GITVER=$(wget -qO- https://www.github.com/Motobug/Project-Plus-Dolphin/releases/tag/v3.1.2-mainline-beta.2 | grep '<p>DOLPHIN' | awk '{print $NF}' | cut -d '<' -f 1)
 APPVER=$(cat $APPDIR/version.txt)
 
 if [[ -z "$GITVER" ]]; then

Data/dolphin-emu.svg

@@ -3,7 +3,7 @@
 branch=`echo ${GITHUB_REF##*/}`
 
 BUILDBIN=/dolphin/dolphin/build/Binaries
-BINFILE=dolphin-emu-x86_64.AppImage
+BINFILE=Project+_Dolphin-x86_64.AppImage
 LOG_FILE=$HOME/curl.log
 CXX=g++-9
 
@@ -23,18 +23,18 @@ cd /tmp
 ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
 cd $HOME
 mkdir -p squashfs-root/usr/bin
-cp -P "$BUILDBIN"/dolphin-emu $HOME/squashfs-root/usr/bin/
+cp -P "$BUILDBIN"/project-plus-dolphin $HOME/squashfs-root/usr/bin/
 
-curl -sL https://raw.githubusercontent.com/qurious-pixel/dolphin/$branch/Data/dolphin-emu.svg -o ./squashfs-root/dolphin-emu.svg
-curl -sL https://raw.githubusercontent.com/qurious-pixel/dolphin/$branch/Data/dolphin-emu.desktop -o ./squashfs-root/dolphin-emu.desktop
+curl -sL https://raw.githubusercontent.com/Motobug/Project-Plus-Dolphin/$branch/Data/project-plus-dolphin.svg -o ./squashfs-root/project-plus-dolphin.svg
+curl -sL https://raw.githubusercontent.com/Motobug/Project-Plus-Dolphin/$branch/Data/project-plus-dolphin.desktop -o ./squashfs-root/project-plus-dolphin.desktop
 curl -sL https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-x86_64 -o ./squashfs-root/runtime
-mkdir -p squashfs-root/usr/share/applications && cp ./squashfs-root/dolphin-emu.desktop ./squashfs-root/usr/share/applications
-mkdir -p squashfs-root/usr/share/icons && cp ./squashfs-root/dolphin-emu.svg ./squashfs-root/usr/share/icons
-mkdir -p squashfs-root/usr/share/icons/hicolor/scalable/apps && cp ./squashfs-root/dolphin-emu.svg ./squashfs-root/usr/share/icons/hicolor/scalable/apps
-mkdir -p squashfs-root/usr/share/pixmaps && cp ./squashfs-root/dolphin-emu.svg ./squashfs-root/usr/share/pixmaps
+mkdir -p squashfs-root/usr/share/applications && cp ./squashfs-root/project-plus-dolphin.desktop ./squashfs-root/usr/share/applications
+mkdir -p squashfs-root/usr/share/icons && cp ./squashfs-root/project-plus-dolphin.svg ./squashfs-root/usr/share/icons
+mkdir -p squashfs-root/usr/share/icons/hicolor/scalable/apps && cp ./squashfs-root/project-plus-dolphin.svg ./squashfs-root/usr/share/icons/hicolor/scalable/apps
+mkdir -p squashfs-root/usr/share/pixmaps && cp ./squashfs-root/project-plus-dolphin.svg ./squashfs-root/usr/share/pixmaps
 mkdir -p squashfs-root/usr/optional/ ; mkdir -p squashfs-root/usr/optional/libstdc++/
 
-mkdir -p squashfs-root/usr/share/dolphin-emu
+mkdir -p squashfs-root/usr/share/project-plus-dolphin
 cp -R /dolphin/dolphin/Data/Sys ./squashfs-root/usr/bin
 curl -sL "https://raw.githubusercontent.com/qurious-pixel/dolphin/$branch/travis/appimage/update.sh" -o $HOME/squashfs-root/update.sh
 curl -sL "https://raw.githubusercontent.com/qurious-pixel/dolphin/$branch/travis/appimage/AppRun" -o $HOME/squashfs-root/AppRun
@@ -55,8 +55,8 @@ unset QT_PLUGIN_PATH
 unset LD_LIBRARY_PATH
 unset QTDIR
 
-# /tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/dolphin-emu -appimage -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs
-/tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/dolphin-emu -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs
+# /tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/project-plus-dolphin -appimage -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs
+/tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/project-plus-dolphin -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs
 export PATH=$(readlink -f /tmp/squashfs-root/usr/bin/):$PATH
 
 # Add AppImageUpdate as the internal updater
@@ -77,7 +77,7 @@ mkdir $HOME/artifacts/
 mkdir -p /dolphin/artifacts/
 mv Project+_Dolphin-x86_64.AppImage* $HOME/artifacts
 cp -R $HOME/artifacts/ /dolphin/
-cp $BUILDBIN/dolphin-emu /dolphin/artifacts
+cp $BUILDBIN/project-plus-dolphin /dolphin/artifacts
 chmod -R 777 /dolphin/artifacts
 cd /dolphin/artifacts
 ls -al /dolphin/artifacts/