From 740f7e0b528957a5ab4f09fa0bc4d3c983002a47 Mon Sep 17 00:00:00 2001
From: rankun <kun.ran@mihoyo.com>
Date: Mon, 8 Apr 2024 13:16:09 +0800
Subject: [PATCH 1/5] fix: record failed

---
 QtScrcpy/QtScrcpyCore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore
index 0ed6236e0..75f94933a 160000
--- a/QtScrcpy/QtScrcpyCore
+++ b/QtScrcpy/QtScrcpyCore
@@ -1 +1 @@
-Subproject commit 0ed6236e0a43cf27baef51dab7a64cb36fd068c0
+Subproject commit 75f94933adbb0a7dd584b7cd099649e17e7f841d

From 72c184b0420c735795b21c8a63009d1a5eb9fead Mon Sep 17 00:00:00 2001
From: rankun <kun.ran@mihoyo.com>
Date: Mon, 8 Apr 2024 14:14:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20QtScrcpyCore=20mac=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QtScrcpy/QtScrcpyCore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore
index 75f94933a..fa40b6ac9 160000
--- a/QtScrcpy/QtScrcpyCore
+++ b/QtScrcpy/QtScrcpyCore
@@ -1 +1 @@
-Subproject commit 75f94933adbb0a7dd584b7cd099649e17e7f841d
+Subproject commit fa40b6ac9d683a39f7cc002f2f49c6c18ecb4981

From 1c35b235fd4902e3091e648754836e5d97a631ed Mon Sep 17 00:00:00 2001
From: rankun <kun.ran@mihoyo.com>
Date: Mon, 8 Apr 2024 14:16:48 +0800
Subject: [PATCH 3/5] fix: build error with version repeat

---
 QtScrcpy/CMakeLists.txt          | 2 +-
 QtScrcpy/{version => appversion} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename QtScrcpy/{version => appversion} (100%)

diff --git a/QtScrcpy/CMakeLists.txt b/QtScrcpy/CMakeLists.txt
index e2fbca455..a9d1c645a 100755
--- a/QtScrcpy/CMakeLists.txt
+++ b/QtScrcpy/CMakeLists.txt
@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 # QC Custom config
 set(QC_PROJECT_NAME "QtScrcpy")
 # Read version numbers from file
-file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/version QC_FILE_VERSION)
+file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/appversion QC_FILE_VERSION)
 set(QC_PROJECT_VERSION ${QC_FILE_VERSION})
 
 # Project declare
diff --git a/QtScrcpy/version b/QtScrcpy/appversion
similarity index 100%
rename from QtScrcpy/version
rename to QtScrcpy/appversion

From ea7e637c845dbf884d8d47aec3d13f50b556a75a Mon Sep 17 00:00:00 2001
From: rankun <kun.ran@mihoyo.com>
Date: Mon, 8 Apr 2024 14:17:09 +0800
Subject: [PATCH 4/5] fix: build error with xcode

---
 .gitignore              | 3 ++-
 ci/mac/build_for_mac.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a6f350f4..2311ca427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@
 build-*
 *.DS_Store
 userdata.ini
-Info_Mac.plist
\ No newline at end of file
+Info_Mac.plist
+/ci/build_temp
\ No newline at end of file
diff --git a/ci/mac/build_for_mac.sh b/ci/mac/build_for_mac.sh
index a3e6dd0c8..47910156d 100755
--- a/ci/mac/build_for_mac.sh
+++ b/ci/mac/build_for_mac.sh
@@ -58,7 +58,7 @@ fi
 mkdir $build_path
 cd $build_path
 
-cmake_params="-DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -G Xcode"
+cmake_params="-DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -DCMAKE_OSX_ARCHITECTURES=x86_64"
 cmake $cmake_params ../..
 if [ $? -ne 0 ] ;then
     echo "cmake failed"

From 0340c35a8439e3c787b5da4d999e9fb914bf04e4 Mon Sep 17 00:00:00 2001
From: rankun <kun.ran@mihoyo.com>
Date: Mon, 8 Apr 2024 14:39:25 +0800
Subject: [PATCH 5/5] fix: build error on version repeat

---
 ci/generate-version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/generate-version.py b/ci/generate-version.py
index 8cd42cb28..74581cd8d 100644
--- a/ci/generate-version.py
+++ b/ci/generate-version.py
@@ -13,7 +13,7 @@
     # print('get tag:', tag)
 
     version = str(tag[1:])
-    version_file = os.path.abspath(os.path.join(os.path.dirname(__file__), "../QtScrcpy/version"))
+    version_file = os.path.abspath(os.path.join(os.path.dirname(__file__), "../QtScrcpy/appversion"))
     file=open(version_file, 'w')
     file.write(version)
     file.close()