mirror of
https://github.com/moonlight-stream/moonlight-qt.git
synced 2025-07-01 07:15:27 +00:00
Remove side-by-side support for Qt 5.9 on Steam Link
This commit is contained in:
parent
522206b0bc
commit
46960ce0a4
@ -5,19 +5,9 @@
|
||||
# pairing data will be lost each reboot.
|
||||
HOME=/usr/local/moonlight
|
||||
|
||||
# For a seamless transition across the Qt 5.9 -> Qt 5.14 boundary,
|
||||
# we bundle binaries built with both Qt 5.9 and Qt 5.14 and pick
|
||||
# the correct one at runtime.
|
||||
if [ -d "/usr/local/Qt-5.14.1" ]; then
|
||||
BIN="moonlight"
|
||||
else
|
||||
BIN="moonlight59"
|
||||
fi
|
||||
|
||||
# Renice PE_Single_CPU which seems to host A/V stuff
|
||||
renice -10 -p $(pidof PE_Single_CPU)
|
||||
|
||||
# Renice Moonlight itself to avoid preemption by background tasks
|
||||
# Write output to a logfile in /tmp
|
||||
echo Launching $BIN
|
||||
exec nice -n -10 ./bin/$BIN > /tmp/moonlight.log
|
||||
exec nice -n -10 ./bin/moonlight > /tmp/moonlight.log
|
||||
|
@ -1,5 +1,4 @@
|
||||
BUILD_CONFIG="release"
|
||||
QT_59_COMMIT="9181b082be53c64daa83f36c7093a783fd07b464"
|
||||
QT_514_COMMIT="609d4aaccb503298e7fa9cef45e0ddc4c4afd63c"
|
||||
|
||||
fail()
|
||||
@ -28,35 +27,6 @@ mkdir $BUILD_FOLDER
|
||||
mkdir $DEPLOY_FOLDER
|
||||
mkdir $INSTALLER_FOLDER
|
||||
|
||||
echo Switching to Qt 5.9 SDK
|
||||
pushd $STEAMLINK_SDK_PATH
|
||||
git fetch origin --unshallow
|
||||
git clean -f -d -x
|
||||
git reset --hard
|
||||
git checkout $QT_59_COMMIT || fail "Unable to checkout $QT_59_COMMIT"
|
||||
popd
|
||||
|
||||
echo Initializing Steam Link SDK for Qt 5.9
|
||||
source $STEAMLINK_SDK_PATH/setenv.sh || fail "SL SDK initialization failed!"
|
||||
|
||||
echo Configuring the project for Qt 5.9
|
||||
pushd $BUILD_FOLDER
|
||||
qmake $SOURCE_ROOT/moonlight-qt.pro QMAKE_CFLAGS_ISYSTEM= || fail "Qmake failed!"
|
||||
popd
|
||||
|
||||
echo Compiling Moonlight for Qt 5.9 in $BUILD_CONFIG configuration
|
||||
pushd $BUILD_FOLDER
|
||||
make -j$(nproc) $(echo "$BUILD_CONFIG" | tr '[:upper:]' '[:lower:]') || fail "Make failed!"
|
||||
popd
|
||||
|
||||
echo Staging Moonlight for Qt 5.9
|
||||
mkdir -p $DEPLOY_FOLDER/steamlink/apps/moonlight/bin
|
||||
cp $BUILD_FOLDER/app/moonlight $DEPLOY_FOLDER/steamlink/apps/moonlight/bin/moonlight59 || fail "Binary copy failed!"
|
||||
|
||||
echo Cleaning build directory
|
||||
rm -rf $BUILD_FOLDER
|
||||
mkdir $BUILD_FOLDER
|
||||
|
||||
echo Switching to Qt 5.14 SDK
|
||||
pushd $STEAMLINK_SDK_PATH
|
||||
git clean -f -d -x
|
||||
|
Loading…
x
Reference in New Issue
Block a user