Merge pull request #545 from barry-ran/dev

Dev

.github/workflows/macos.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: macos-latest
+    runs-on: macos-10.15
     strategy:
       matrix:
         qt-ver: [5.15.1]
@@ -44,7 +44,7 @@ jobs:
           ENV_QT_PATH: ${{ env.qt-install-path }}
         run: |
           python ci/generate-version.py
-          ci/mac/build_for_mac.sh release
+          ci/mac/build_for_mac.sh RelWithDebInfo
       # 获取ref最后一个/后的内容
       - name: Get the version
         shell: bash

.github/workflows/ubuntu.yml

@@ -6,6 +6,7 @@ on:
       - 'QtScrcpy/**'
       - '!QtScrcpy/res/**'
       - '.github/workflows/ubuntu.yml'
+      - 'ci/linux/**'
   pull_request:
     paths:
       - 'QtScrcpy/**'
@@ -17,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-16.04,ubuntu-18.04]
+        os: [ubuntu-18.04]
         qt-ver: [5.15.1]
         qt-arch-install: [gcc_64]
         gcc-arch: [x64]
@@ -47,4 +48,4 @@ jobs:
           ENV_QT_PATH: ${{ env.qt-install-path }}
         run: |
           python ci/generate-version.py
-          ci/linux/build_for_ubuntu.sh release
+          ci/linux/build_for_ubuntu.sh RelWithDebInfo

.github/workflows/windows.yml

@@ -76,7 +76,7 @@ jobs:
           ENV_QT_PATH: ${{ env.qt-install-path }}
         run: |
           call python ci\generate-version.py
-          call "ci\win\build_for_win.bat" release ${{ matrix.msvc-arch }}
+          call "ci\win\build_for_win.bat" RelWithDebInfo ${{ matrix.msvc-arch }}
       # 获取ref最后一个/后的内容
       - name: Get the version
         shell: bash

.gitignore

@@ -12,4 +12,5 @@
 /build/
 build-*
 *.DS_Store
-userdata.ini
+userdata.ini
+Info_Mac.plist

CMakeLists.txt

@@ -1,21 +1,4 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
-
-# Read version numbers from file
-file (STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/QtScrcpy/version STRING_VERSION)
-message(STATUS "QtScrcpy Version ${STRING_VERSION}")
-project(QtScrcpy
-    VERSION ${STRING_VERSION}
-    LANGUAGES C CXX
-)
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    enable_language(OBJCXX)
-endif()
-
-# Split version numbers
-string(REPLACE "." ";" VERSION_LIST ${STRING_VERSION})
-list(GET VERSION_LIST 0 VERSION_MAJOR)
-list(GET VERSION_LIST 1 VERSION_MINOR)
-list(GET VERSION_LIST 2 VERSION_PATCH)
+project(all)
 
 add_subdirectory(QtScrcpy)