From 3ea214bd47d94b72ae7580486162ce20c1aa6ea7 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Sun, 31 Jul 2022 09:27:33 -0600
Subject: [PATCH] fix qmake path

---
 .github/workflows/build.yml | 3 ---
 build.sh                    | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15249de..45b6fee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,9 +44,6 @@ jobs:
             mingw-w64-x86_64-nasm
             git
             zip
-      - name: Fix qmake path
-        run: |
-          msys2 -c 'ln -s /mingw64/bin/qmake-qt6.exe /mingw64/bin/qmake.exe'
       - name: Run build script
         run: msys2 -c 'export M64P_AUTOUPDATE=1; ./build.sh'
         env:
diff --git a/build.sh b/build.sh
index d9a265b..625d73a 100755
--- a/build.sh
+++ b/build.sh
@@ -36,7 +36,7 @@ cp $base_dir/mupen64plus-input-raphnetraw/projects/unix/*$suffix $install_dir
 
 mkdir -p $base_dir/mupen64plus-input-qt/build
 cd $base_dir/mupen64plus-input-qt/build
-qmake ../mupen64plus-input-qt.pro
+qmake6 ../mupen64plus-input-qt.pro
 make -j4
 if [[ $UNAME == *"MINGW"* ]]; then
   cp $base_dir/mupen64plus-input-qt/build/release/mupen64plus-input-qt.dll $install_dir
@@ -63,7 +63,7 @@ fi
 
 mkdir -p $base_dir/mupen64plus-gui/build
 cd $base_dir/mupen64plus-gui/build
-qmake ../mupen64plus-gui.pro
+qmake6 ../mupen64plus-gui.pro
 make -j4
 if [[ $UNAME == *"MINGW"* ]]; then
   cp $base_dir/mupen64plus-gui/build/release/mupen64plus-gui.exe $install_dir