ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux / Windows CMake Builds: Change output executable to lowercase 

No reason to be uppercase.
This commit is contained in:
Ty Lamontagne 2021-12-04 18:45:23 -05:00 committed by refractionpcsx2
parent 70145eb150
commit 1695124472
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/scripts/linux/appimage.sh vendored
View File

@ -25,8 +25,8 @@ sudo cp /usr/local/bin/patchelf /tmp/squashfs-root/usr/bin/patchelf
cd "$GITHUB_WORKSPACE" cd "$GITHUB_WORKSPACE"
mkdir -p squashfs-root/usr/bin mkdir -p squashfs-root/usr/bin
ls -al "$BUILDBIN" ls -al "$BUILDBIN"
cp -P "$BUILDBIN"/PCSX2 "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/ cp -P "$BUILDBIN"/pcsx2 "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/
patchelf --set-rpath /tmp/PCSX2 "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/PCSX2 patchelf --set-rpath /tmp/PCSX2 "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/pcsx2
cp ./pcsx2/gui/Resources/AppIcon64.png ./squashfs-root/PCSX2.png cp ./pcsx2/gui/Resources/AppIcon64.png ./squashfs-root/PCSX2.png
cp ./linux_various/PCSX2.desktop.in ./squashfs-root/PCSX2.desktop cp ./linux_various/PCSX2.desktop.in ./squashfs-root/PCSX2.desktop
sed -i -e 's|Categories=@PCSX2_MENU_CATEGORIES@|Categories=Game;Emulator;|g' ./squashfs-root/PCSX2.desktop sed -i -e 's|Categories=@PCSX2_MENU_CATEGORIES@|Categories=Game;Emulator;|g' ./squashfs-root/PCSX2.desktop

2
.github/workflows/windows-workflow.yml vendored
View File

@ -121,7 +121,7 @@ jobs:
Release) SIMD="SSE4";; Release) SIMD="SSE4";;
*AVX2) SIMD="AVX2";; *AVX2) SIMD="AVX2";;
CMake) SIMD="CMake" CMake) SIMD="CMake"
cp build/pcsx2/PCSX2* bin/ ;; cp build/pcsx2/pcsx2* bin/ ;;
*) SIMD="UNKNOWN";; *) SIMD="UNKNOWN";;
esac esac
if [ ${{ github.event_name }} == "pull_request" ]; then if [ ${{ github.event_name }} == "pull_request" ]; then

3
.gitignore vendored
View File

@ -73,10 +73,9 @@ oprofile_data/
/bin/**/*.ilk /bin/**/*.ilk
/bin/**/*.lib /bin/**/*.lib
/bin/**/*.pdb /bin/**/*.pdb
/bin/PCSX2 /bin/pcsx2
/bin/PCSX2-linux.sh /bin/PCSX2-linux.sh
/bin/*ReplayLoader /bin/*ReplayLoader
/bin/PCSX2-linux.sh
/bin/GS*.txt /bin/GS*.txt
/bin/bios /bin/bios
/bin/cache /bin/cache

2
linux_various/PCSX2-linux.sh
View File

@ -43,7 +43,7 @@ fi
DIR=`dirname $current_script` DIR=`dirname $current_script`
MY_LD_LIBRARY_PATH=$LD_LIBRARY_PATH MY_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
if [ ! -x "$DIR/PCSX2" ] if [ ! -x "$DIR/pcsx2" ]
then then
echo "Error PCSX2 not found in $DIR" echo "Error PCSX2 not found in $DIR"
echo "Maybe the script was directly 'called'" echo "Maybe the script was directly 'called'"

2
linux_various/PCSX2.desktop.in
View File

@ -9,7 +9,7 @@ GenericName[zh_CN]=PlayStation 2 模拟器
Comment=Sony PlayStation 2 emulator Comment=Sony PlayStation 2 emulator
Comment[ru]=Эмулятор Sony PlayStation 2 Comment[ru]=Эмулятор Sony PlayStation 2
Comment[zh_CN]=索尼 PlayStation 2 模拟器 Comment[zh_CN]=索尼 PlayStation 2 模拟器
Exec=env GDK_BACKEND=x11 MESA_NO_ERROR=1 PCSX2 Exec=env GDK_BACKEND=x11 MESA_NO_ERROR=1 pcsx2
Icon=PCSX2 Icon=PCSX2
Keywords=game;emulator; Keywords=game;emulator;
Categories=@PCSX2_MENU_CATEGORIES@ Categories=@PCSX2_MENU_CATEGORIES@

10
pcsx2/CMakeLists.txt
View File

@ -1483,6 +1483,12 @@ foreach(path IN LISTS RESOURCE_FILES)
pcsx2_resource(${path} ${CMAKE_SOURCE_DIR}/bin/resources/) pcsx2_resource(${path} ${CMAKE_SOURCE_DIR}/bin/resources/)
endforeach() endforeach()
if (NOT APPLE)
set_target_properties(PCSX2 PROPERTIES
OUTPUT_NAME pcsx2
)
endif()
if (APPLE) if (APPLE)
# MacOS defaults to having a maximum protection of the __DATA segment of rw (non-executable) # MacOS defaults to having a maximum protection of the __DATA segment of rw (non-executable)
# We have a bunch of page-sized arrays in bss that we use for jit # We have a bunch of page-sized arrays in bss that we use for jit
@ -1522,9 +1528,9 @@ endif()
if(NOT DISABLE_SETCAP) if(NOT DISABLE_SETCAP)
if(PACKAGE_MODE) if(PACKAGE_MODE)
install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f '${CMAKE_INSTALL_FULL_BINDIR}/PCSX2' ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' '${CMAKE_INSTALL_FULL_BINDIR}/PCSX2'; set +x\")") install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f '${CMAKE_INSTALL_FULL_BINDIR}/pcsx2' ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' '${CMAKE_INSTALL_FULL_BINDIR}/pcsx2'; set +x\")")
else() else()
install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f '${CMAKE_SOURCE_DIR}/bin/PCSX2' ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' '${CMAKE_SOURCE_DIR}/bin/PCSX2'; set +x\")") install(CODE "execute_process(COMMAND /bin/bash -c \"echo 'Enabling networking capability on Linux...';set -x; [ -f '${CMAKE_SOURCE_DIR}/bin/pcsx2' ] && sudo setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' '${CMAKE_SOURCE_DIR}/bin/pcsx2'; set +x\")")
endif() endif()
endif() endif()