From 20bb9d22d0936484b556269966fea63e4aa56a0b Mon Sep 17 00:00:00 2001 From: Barry <870709864@qq.com> Date: Sat, 24 Nov 2018 13:54:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0windows=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QtScrcpy/QtScrcpy.pro | 49 +++++++++++++++++++------------------- QtScrcpy/res/QtScrcpy.ico | Bin 0 -> 67646 bytes QtScrcpy/res/QtScrcpy.rc | 34 ++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 QtScrcpy/res/QtScrcpy.ico create mode 100644 QtScrcpy/res/QtScrcpy.rc diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro index 17752d3..3f87cd8 100644 --- a/QtScrcpy/QtScrcpy.pro +++ b/QtScrcpy/QtScrcpy.pro @@ -39,27 +39,6 @@ FORMS += \ dialog.ui \ videoform.ui -# *********************************************************** -# 输出目录 -# *********************************************************** -# Win平台下输出目录 -win32 { - CONFIG(debug, debug|release) { - DESTDIR = $$PWD/../output/win/debug - } else { - DESTDIR = $$PWD/../output/win/release - } -} - -# Mac os平台下输出目录 -macos { - CONFIG(debug, debug|release) { - DESTDIR = $$PWD/../output/mac/debug - } else { - DESTDIR = $$PWD/../output/mac/release - } -} - # 子工程 include ($$PWD/common/common.pri) include ($$PWD/server/server.pri) @@ -80,27 +59,49 @@ INCLUDEPATH += \ $$PWD/android \ $$PWD/inputcontrol + # *********************************************************** -# 依赖模块 +# Win平台下配置 # *********************************************************** -# Win平台下依赖模块 win32 { + # 输出目录 + CONFIG(debug, debug|release) { + DESTDIR = $$PWD/../output/win/debug + } else { + DESTDIR = $$PWD/../output/win/release + } + + # 依赖模块 LIBS += \ -L$$PWD/../third_party/ffmpeg/lib -lavcodec \ -L$$PWD/../third_party/ffmpeg/lib -lavformat \ -L$$PWD/../third_party/ffmpeg/lib -lavutil \ -L$$PWD/../third_party/ffmpeg/lib -lswscale \ -lUser32 + + # windows rc file + RC_FILE = $$PWD/res/QtScrcpy.rc } -# mac平台下依赖模块 +# *********************************************************** +# Mac平台下配置 +# *********************************************************** macos { + # 输出目录 + CONFIG(debug, debug|release) { + DESTDIR = $$PWD/../output/mac/debug + } else { + DESTDIR = $$PWD/../output/mac/release + } + + # 依赖模块 LIBS += \ -L$$PWD/../third_party/ffmpeg/lib -lavcodec.58 \ -L$$PWD/../third_party/ffmpeg/lib -lavformat.58 \ -L$$PWD/../third_party/ffmpeg/lib -lavutil.56 \ -L$$PWD/../third_party/ffmpeg/lib -lswscale.5 + # mac bundle file APP_SCRCPY_SERVER.files = $$files($$PWD/../third_party/scrcpy-server.jar) APP_SCRCPY_SERVER.path = Contents/MacOS QMAKE_BUNDLE_DATA += APP_SCRCPY_SERVER diff --git a/QtScrcpy/res/QtScrcpy.ico b/QtScrcpy/res/QtScrcpy.ico new file mode 100644 index 0000000000000000000000000000000000000000..c8188b2418f0d845e24d4778b113613b6ad34a40 GIT binary patch literal 67646 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