diff --git a/QtScrcpy/CMakeLists.txt b/QtScrcpy/CMakeLists.txt index fc3e916..d0c12a5 100755 --- a/QtScrcpy/CMakeLists.txt +++ b/QtScrcpy/CMakeLists.txt @@ -52,8 +52,9 @@ if (MSVC) add_compile_options(/W3 /WX /wd4566) # avoid warning C4819 - add_compile_options(-source-charset:utf-8) - #add_compile_options(/utf-8) + #add_compile_options(-source-charset:utf-8) + # /utf-8 will set source charset and execution charset to utf-8, so we don't need to set source-charset:utf-8 + add_compile_options(/utf-8) # ensure we use minimal "windows.h" lib without the crazy min max macros add_compile_definitions(NOMINMAX WIN32_LEAN_AND_MEAN) @@ -294,6 +295,9 @@ endif() # MacOS if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + # qt6 need 10.15 or later + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") + # copy bundle file get_target_property(MACOS_BUNDLE_PATH ${PROJECT_NAME} RUNTIME_OUTPUT_DIRECTORY) set(MACOS_BUNDLE_PATH ${MACOS_BUNDLE_PATH}/${PROJECT_NAME}.app/Contents) diff --git a/ci/mac/build_for_mac.sh b/ci/mac/build_for_mac.sh index b38a4bf..4791015 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 -DCMAKE_OSX_ARCHITECTURES=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=10.10" +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"