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/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/QtScrcpyCore b/QtScrcpy/QtScrcpyCore index 0ed6236e0..fa40b6ac9 160000 --- a/QtScrcpy/QtScrcpyCore +++ b/QtScrcpy/QtScrcpyCore @@ -1 +1 @@ -Subproject commit 0ed6236e0a43cf27baef51dab7a64cb36fd068c0 +Subproject commit fa40b6ac9d683a39f7cc002f2f49c6c18ecb4981 diff --git a/QtScrcpy/version b/QtScrcpy/appversion similarity index 100% rename from QtScrcpy/version rename to QtScrcpy/appversion 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() 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"