Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge dev #943

Merged
merged 5 commits into from
Apr 8, 2024
Merged

merge dev #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
740f7e0
fix: record failed
Apr 8, 2024
72c184b
fix: QtScrcpyCore mac编译错误
Apr 8, 2024
1c35b23
fix: build error with version repeat
Apr 8, 2024
ea7e637
fix: build error with xcode
Apr 8, 2024
0340c35
fix: build error on version repeat
Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
build-*
*.DS_Store
userdata.ini
Info_Mac.plist
Info_Mac.plist
/ci/build_temp
2 changes: 1 addition & 1 deletion QtScrcpy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion QtScrcpy/QtScrcpyCore
Open in desktop
Submodule QtScrcpyCore updated 6 files
+8 −16 src/device/demuxer/demuxer.cpp
+4 −1 src/device/demuxer/demuxer.h
+1 −0 src/device/device.cpp
+9 −0 src/device/recorder/recorder.cpp
+22 −3 src/device/server/server.cpp
+1 −1 src/device/server/server.h
0 QtScrcpy/version → QtScrcpy/appversion
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ci/generate-version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion ci/mac/build_for_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading