@@ -51,9 +51,6 @@ chmod +x ./get-debloated-pkgs.sh
5151
5252echo " Building citron..."
5353echo " ---------------------------------------------------------------"
54- sed -i ' s|EUID == 0|EUID == 69|g' /usr/bin/makepkg
55- sed -i ' s|-O2|-O3|; s|MAKEFLAGS=.*|MAKEFLAGS="-j$(nproc)"|; s|#MAKEFLAGS|MAKEFLAGS|' /etc/makepkg.conf
56- cat /etc/makepkg.conf
5754
5855if [ " $1 " = ' v3' ] && [ " $ARCH " = ' x86_64' ]; then
5956 echo " Making x86-64-v3 optimized build of citron..."
6663 ARCH_FLAGS=" -march=armv8-a -mtune=generic -O3"
6764fi
6865
69- if [ " $DEVEL " = ' true' ]; then
70- citronpkg=citron-git
71- echo " Making nightly build..."
72- else
73- citronpkg=citron
74- echo " Making stable build..."
75- fi
66+ git clone --recursive " https://git.citron-emu.org/citron/emulator.git" ./citron && (
67+ cd ./citron
7668
77- git clone https://aur.archlinux.org/" $citronpkg " .git ./citron
78- cd ./citron
69+ if [ " $DEVEL " = ' true' ]; then
70+ CITRON_TAG=" $( git rev-parse --short HEAD) "
71+ echo " Making nightly \" $CITRON_TAG \" build"
72+ VERSION=" $CITRON_TAG "
73+ else
74+ CITRON_TAG=$( git describe --tags)
75+ echo " Making stable \" $CITRON_TAG \" build"
76+ git checkout " $CITRON_TAG "
77+ VERSION=" $( echo " $CITRON_TAG " | awk -F' -' ' {print $1}' ) "
78+ fi
7979
80- sed -i \
81- -e " s|x86_64|$ARCH |g" \
82- -e ' s|DISCORD_PRESENCE=ON|DISCORD_PRESENCE=OFF|' \
83- -e ' s|USE_QT_MULTIMEDIA=ON|USE_QT_MULTIMEDIA=OFF|' \
84- -e ' s|BUILD_TYPE=None|BUILD_TYPE=Release|' \
85- -e " s|\$ CXXFLAGS|$ARCH_FLAGS |g" \
86- -e " s|\$ CFLAGS|$ARCH_FLAGS |g" \
87- ./PKGBUILD
88- cat ./PKGBUILD
80+ # remove mysterious sse2neon library dependency
81+ sed -i ' /sse2neon/d' ./src/video_core/CMakeLists.txt
8982
90- makepkg -fs --noconfirm --skippgpcheck
91- ls -la .
92- pacman --noconfirm -U ./* .pkg.tar.*
93- pacman -Q " $citronpkg " | awk ' {print $2; exit}' > ~ /version
83+ mkdir ./build
84+ cd ./build
85+ cmake .. -GNinja \
86+ -DCMAKE_BUILD_TYPE=Release \
87+ -DUSE_SYSTEM_QT=ON \
88+ -DCITRON_USE_BUNDLED_VCPKG=OFF \
89+ -DCITRON_USE_BUNDLED_FFMPEG=OFF \
90+ -DCITRON_USE_BUNDLED_SDL2=OFF \
91+ -DCITRON_USE_EXTERNAL_SDL2=OFF \
92+ -DCITRON_CHECK_SUBMODULES=OFF \
93+ -DCITRON_ENABLE_LTO=ON \
94+ -DCITRON_TESTS=OFF \
95+ -DENABLE_QT_TRANSLATION=ON \
96+ -DCMAKE_SYSTEM_PROCESSOR=" $( uname -m) " \
97+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
98+ -DCMAKE_C_FLAGS=" $ARCH_FLAGS " \
99+ -DCMAKE_CXX_FLAGS=" $ARCH_FLAGS -Wno-error -Wno-template-body -w"
100+ ninja
101+ sudo ninja install
102+ echo " $VERSION " > ~/version
103+ )
0 commit comments