mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-08-03 14:18:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #943 from barry-ran/dev

Browse source 
merge dev
This commit is contained in:
Barry 2024-04-08 14:43:27 +08:00 • committed by GitHub
commit 321913d0dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -14,3 +14,4 @@ build-*
*.DS_Store *.DS_Store
userdata.ini userdata.ini
Info_Mac.plist Info_Mac.plist
/ci/build_temp

2
QtScrcpy/CMakeLists.txt
View file

@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
# QC Custom config # QC Custom config
set(QC_PROJECT_NAME "QtScrcpy") set(QC_PROJECT_NAME "QtScrcpy")
# Read version numbers from file # 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}) set(QC_PROJECT_VERSION ${QC_FILE_VERSION})
# Project declare # Project declare

2
QtScrcpy/QtScrcpyCore

@ -1 +1 @@
Subproject commit 0ed6236e0a43cf27baef51dab7a64cb36fd068c0 Subproject commit fa40b6ac9d683a39f7cc002f2f49c6c18ecb4981

0
QtScrcpy/version → QtScrcpy/appversion
View file

2
ci/generate-version.py
View file

@ -13,7 +13,7 @@ if __name__ == '__main__':
# print('get tag:', tag) # print('get tag:', tag)
version = str(tag[1:]) 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=open(version_file, 'w')
file.write(version) file.write(version)
file.close() file.close()

2
ci/mac/build_for_mac.sh
View file

@ -58,7 +58,7 @@ fi
mkdir $build_path mkdir $build_path
cd $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 ../.. cmake $cmake_params ../..
if [ $? -ne 0 ] ;then if [ $? -ne 0 ] ;then
echo "cmake failed" echo "cmake failed"