Merge pull request #943 from barry-ran/dev

merge dev
barry-ran · Apr 8, 2024 · 321913d · 321913d
2 parents 91a6b4c + 0340c35
commit 321913d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@
 build-*
 *.DS_Store
 userdata.ini
-Info_Mac.plist
+Info_Mac.plist
+/ci/build_temp
diff --git 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/QtScrcpyCore b/QtScrcpy/QtScrcpyCore
diff --git a/QtScrcpy/version → QtScrcpy/appversion b/QtScrcpy/version → QtScrcpy/appversion
diff --git 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()

diff --git 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"