From f675e11f3cff3cabf9e420089b32c71bb93aab08 Mon Sep 17 00:00:00 2001 From: Barry <870709864@qq.com> Date: Sun, 5 Jun 2022 18:03:08 +0800 Subject: [PATCH] refactor: add QtScrcpyCore --- QtScrcpy/CMakeLists.txt | 134 +++++------ QtScrcpy/QtScrcpy.pro | 214 ------------------ .../{ => QtScrcpyCore}/include/QtScrcpyCore.h | 0 .../include/QtScrcpyCoreDef.h | 0 .../{ => QtScrcpyCore}/include/include.pri | 0 .../{ => QtScrcpyCore/src}/adb/adbprocess.cpp | 0 .../{ => QtScrcpyCore/src}/adb/adbprocess.h | 0 .../src}/device/android/input.h | 0 .../src}/device/android/keycodes.h | 0 .../src}/device/controller/controller.cpp | 0 .../src}/device/controller/controller.h | 0 .../controller/inputconvert/controlmsg.cpp | 0 .../controller/inputconvert/controlmsg.h | 0 .../inputconvert/inputconvertbase.cpp | 0 .../inputconvert/inputconvertbase.h | 0 .../inputconvert/inputconvertgame.cpp | 0 .../inputconvert/inputconvertgame.h | 0 .../inputconvert/inputconvertnormal.cpp | 0 .../inputconvert/inputconvertnormal.h | 0 .../controller/inputconvert/keymap/keymap.cpp | 0 .../controller/inputconvert/keymap/keymap.h | 0 .../device/controller/receiver/devicemsg.cpp | 0 .../device/controller/receiver/devicemsg.h | 0 .../device/controller/receiver/receiver.cpp | 0 .../device/controller/receiver/receiver.h | 0 .../src}/device/decoder/avframeconvert.cpp | 0 .../src}/device/decoder/avframeconvert.h | 0 .../src}/device/decoder/decoder.cpp | 0 .../src}/device/decoder/decoder.h | 0 .../src}/device/decoder/fpscounter.cpp | 0 .../src}/device/decoder/fpscounter.h | 0 .../src}/device/decoder/videobuffer.cpp | 0 .../src}/device/decoder/videobuffer.h | 0 .../{ => QtScrcpyCore/src}/device/device.cpp | 0 .../{ => QtScrcpyCore/src}/device/device.h | 2 +- .../src}/device/filehandler/filehandler.cpp | 0 .../src}/device/filehandler/filehandler.h | 0 .../src}/device/recorder/recorder.cpp | 0 .../src}/device/recorder/recorder.h | 0 .../src}/device/render/qyuvopenglwidget.cpp | 0 .../src}/device/render/qyuvopenglwidget.h | 0 .../src}/device/server/server.cpp | 0 .../src}/device/server/server.h | 0 .../src}/device/server/tcpserver.cpp | 0 .../src}/device/server/tcpserver.h | 0 .../src}/device/server/videosocket.cpp | 0 .../src}/device/server/videosocket.h | 0 .../src}/device/stream/stream.cpp | 0 .../src}/device/stream/stream.h | 0 .../src}/devicemanage/devicemanage.cpp | 0 .../src}/devicemanage/devicemanage.h | 2 +- QtScrcpy/adb/adb.pri | 5 - QtScrcpy/device/android/android.pri | 3 - QtScrcpy/device/controller/controller.pri | 14 -- .../controller/inputconvert/inputconvert.pri | 17 -- .../controller/inputconvert/keymap/keymap.pri | 5 - .../device/controller/receiver/receiver.pri | 7 - QtScrcpy/device/decoder/decoder.pri | 11 - QtScrcpy/device/device.pri | 25 -- QtScrcpy/device/filehandler/filehandler.pri | 5 - QtScrcpy/device/recorder/recorder.pri | 5 - QtScrcpy/device/render/render.pri | 5 - QtScrcpy/device/server/server.pri | 9 - QtScrcpy/device/stream/stream.pri | 6 - QtScrcpy/devicemanage/devicemanage.pri | 5 - QtScrcpy/fontawesome/fontawesome.pri | 5 - QtScrcpy/ui/dialog.h | 2 +- QtScrcpy/ui/toolform.h | 2 +- QtScrcpy/ui/ui.pri | 14 -- QtScrcpy/ui/videoform.h | 2 +- QtScrcpy/uibase/uibase.pri | 9 - QtScrcpy/util/mousetap/mousetap.pri | 25 -- QtScrcpy/util/util.pri | 10 - 73 files changed, 72 insertions(+), 471 deletions(-) delete mode 100644 QtScrcpy/QtScrcpy.pro rename QtScrcpy/{ => QtScrcpyCore}/include/QtScrcpyCore.h (100%) rename QtScrcpy/{ => QtScrcpyCore}/include/QtScrcpyCoreDef.h (100%) rename QtScrcpy/{ => QtScrcpyCore}/include/include.pri (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/adb/adbprocess.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/adb/adbprocess.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/android/input.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/android/keycodes.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/controller.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/controller.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/controlmsg.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/controlmsg.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/inputconvertbase.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/inputconvertbase.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/inputconvertgame.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/inputconvertgame.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/inputconvertnormal.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/inputconvertnormal.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/keymap/keymap.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/inputconvert/keymap/keymap.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/receiver/devicemsg.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/receiver/devicemsg.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/receiver/receiver.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/controller/receiver/receiver.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/decoder/avframeconvert.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/decoder/avframeconvert.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/decoder/decoder.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/decoder/decoder.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/decoder/fpscounter.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/decoder/fpscounter.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/decoder/videobuffer.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/decoder/videobuffer.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/device.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/device.h (98%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/filehandler/filehandler.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/filehandler/filehandler.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/recorder/recorder.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/recorder/recorder.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/render/qyuvopenglwidget.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/render/qyuvopenglwidget.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/server/server.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/server/server.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/server/tcpserver.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/server/tcpserver.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/server/videosocket.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/server/videosocket.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/stream/stream.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/device/stream/stream.h (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/devicemanage/devicemanage.cpp (100%) rename QtScrcpy/{ => QtScrcpyCore/src}/devicemanage/devicemanage.h (95%) delete mode 100644 QtScrcpy/adb/adb.pri delete mode 100644 QtScrcpy/device/android/android.pri delete mode 100644 QtScrcpy/device/controller/controller.pri delete mode 100644 QtScrcpy/device/controller/inputconvert/inputconvert.pri delete mode 100644 QtScrcpy/device/controller/inputconvert/keymap/keymap.pri delete mode 100644 QtScrcpy/device/controller/receiver/receiver.pri delete mode 100644 QtScrcpy/device/decoder/decoder.pri delete mode 100644 QtScrcpy/device/device.pri delete mode 100644 QtScrcpy/device/filehandler/filehandler.pri delete mode 100644 QtScrcpy/device/recorder/recorder.pri delete mode 100644 QtScrcpy/device/render/render.pri delete mode 100644 QtScrcpy/device/server/server.pri delete mode 100644 QtScrcpy/device/stream/stream.pri delete mode 100644 QtScrcpy/devicemanage/devicemanage.pri delete mode 100644 QtScrcpy/fontawesome/fontawesome.pri delete mode 100644 QtScrcpy/ui/ui.pri delete mode 100644 QtScrcpy/uibase/uibase.pri delete mode 100644 QtScrcpy/util/mousetap/mousetap.pri delete mode 100644 QtScrcpy/util/util.pri diff --git a/QtScrcpy/CMakeLists.txt b/QtScrcpy/CMakeLists.txt index ca4fc9c..444556c 100755 --- a/QtScrcpy/CMakeLists.txt +++ b/QtScrcpy/CMakeLists.txt @@ -94,10 +94,10 @@ message(STATUS "[${PROJECT_NAME}] Qt version is: ${QT_VERSION_MAJOR}.${QT_VERSIO # adb set(QC_ADB_SOURCES - adb/adbprocess.h - adb/adbprocess.cpp + QtScrcpyCore/src/adb/adbprocess.h + QtScrcpyCore/src/adb/adbprocess.cpp ) -source_group(adb FILES ${QC_ADB_SOURCES}) +source_group(QtScrcpyCore/src/adb FILES ${QC_ADB_SOURCES}) # common set(QC_COMMON_SOURCES @@ -107,64 +107,64 @@ source_group(common FILES ${QC_COMMON_SOURCES}) # include set(QC_INCLUDE_SOURCES - include/QtScrcpyCore.h - include/QtScrcpyCoreDef.h + QtScrcpyCore/include/QtScrcpyCore.h + QtScrcpyCore/include/QtScrcpyCoreDef.h ) -source_group(include FILES ${QC_INCLUDE_SOURCES}) +source_group(QtScrcpyCore/include FILES ${QC_INCLUDE_SOURCES}) # device set(QC_DEVICE_SOURCES - device/device.h - device/device.cpp - device/android/input.h - device/android/keycodes.h - device/controller/controller.h - device/controller/controller.cpp - device/controller/inputconvert/inputconvertbase.h - device/controller/inputconvert/inputconvertbase.cpp - device/controller/inputconvert/inputconvertnormal.h - device/controller/inputconvert/inputconvertnormal.cpp - device/controller/inputconvert/inputconvertgame.h - device/controller/inputconvert/inputconvertgame.cpp - device/controller/inputconvert/controlmsg.h - device/controller/inputconvert/controlmsg.cpp - device/controller/inputconvert/keymap/keymap.h - device/controller/inputconvert/keymap/keymap.cpp - device/controller/receiver/devicemsg.h - device/controller/receiver/devicemsg.cpp - device/controller/receiver/receiver.h - device/controller/receiver/receiver.cpp - device/decoder/avframeconvert.h - device/decoder/avframeconvert.cpp - device/decoder/decoder.h - device/decoder/decoder.cpp - device/decoder/fpscounter.h - device/decoder/fpscounter.cpp - device/decoder/videobuffer.h - device/decoder/videobuffer.cpp - device/filehandler/filehandler.h - device/filehandler/filehandler.cpp - device/recorder/recorder.h - device/recorder/recorder.cpp - device/render/qyuvopenglwidget.h - device/render/qyuvopenglwidget.cpp - device/server/server.h - device/server/server.cpp - device/server/tcpserver.h - device/server/tcpserver.cpp - device/server/videosocket.h - device/server/videosocket.cpp - device/stream/stream.h - device/stream/stream.cpp + QtScrcpyCore/src/device/device.h + QtScrcpyCore/src/device/device.cpp + QtScrcpyCore/src/device/android/input.h + QtScrcpyCore/src/device/android/keycodes.h + QtScrcpyCore/src/device/controller/controller.h + QtScrcpyCore/src/device/controller/controller.cpp + QtScrcpyCore/src/device/controller/inputconvert/inputconvertbase.h + QtScrcpyCore/src/device/controller/inputconvert/inputconvertbase.cpp + QtScrcpyCore/src/device/controller/inputconvert/inputconvertnormal.h + QtScrcpyCore/src/device/controller/inputconvert/inputconvertnormal.cpp + QtScrcpyCore/src/device/controller/inputconvert/inputconvertgame.h + QtScrcpyCore/src/device/controller/inputconvert/inputconvertgame.cpp + QtScrcpyCore/src/device/controller/inputconvert/controlmsg.h + QtScrcpyCore/src/device/controller/inputconvert/controlmsg.cpp + QtScrcpyCore/src/device/controller/inputconvert/keymap/keymap.h + QtScrcpyCore/src/device/controller/inputconvert/keymap/keymap.cpp + QtScrcpyCore/src/device/controller/receiver/devicemsg.h + QtScrcpyCore/src/device/controller/receiver/devicemsg.cpp + QtScrcpyCore/src/device/controller/receiver/receiver.h + QtScrcpyCore/src/device/controller/receiver/receiver.cpp + QtScrcpyCore/src/device/decoder/avframeconvert.h + QtScrcpyCore/src/device/decoder/avframeconvert.cpp + QtScrcpyCore/src/device/decoder/decoder.h + QtScrcpyCore/src/device/decoder/decoder.cpp + QtScrcpyCore/src/device/decoder/fpscounter.h + QtScrcpyCore/src/device/decoder/fpscounter.cpp + QtScrcpyCore/src/device/decoder/videobuffer.h + QtScrcpyCore/src/device/decoder/videobuffer.cpp + QtScrcpyCore/src/device/filehandler/filehandler.h + QtScrcpyCore/src/device/filehandler/filehandler.cpp + QtScrcpyCore/src/device/recorder/recorder.h + QtScrcpyCore/src/device/recorder/recorder.cpp + QtScrcpyCore/src/device/render/qyuvopenglwidget.h + QtScrcpyCore/src/device/render/qyuvopenglwidget.cpp + QtScrcpyCore/src/device/server/server.h + QtScrcpyCore/src/device/server/server.cpp + QtScrcpyCore/src/device/server/tcpserver.h + QtScrcpyCore/src/device/server/tcpserver.cpp + QtScrcpyCore/src/device/server/videosocket.h + QtScrcpyCore/src/device/server/videosocket.cpp + QtScrcpyCore/src/device/stream/stream.h + QtScrcpyCore/src/device/stream/stream.cpp ) -source_group(device FILES ${QC_DEVICE_SOURCES}) +source_group(QtScrcpyCore/src/device FILES ${QC_DEVICE_SOURCES}) # devicemanage set(QC_DEVICEMANAGE_SOURCES - devicemanage/devicemanage.h - devicemanage/devicemanage.cpp + QtScrcpyCore/src/devicemanage/devicemanage.h + QtScrcpyCore/src/devicemanage/devicemanage.cpp ) -source_group(devicemanage FILES ${QC_DEVICEMANAGE_SOURCES}) +source_group(QtScrcpyCore/src/devicemanage FILES ${QC_DEVICEMANAGE_SOURCES}) # fontawesome set(QC_FONTAWESOME_SOURCES @@ -293,22 +293,22 @@ add_executable(${PROJECT_NAME} ${QC_RUNTIME_TYPE} ${QC_PROJECT_SOURCES}) # Internal include path (todo: remove this, use absolute path include) # -target_include_directories(${PROJECT_NAME} PRIVATE adb) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/adb) target_include_directories(${PROJECT_NAME} PRIVATE common) -target_include_directories(${PROJECT_NAME} PRIVATE device) -target_include_directories(${PROJECT_NAME} PRIVATE device/filehandler) -target_include_directories(${PROJECT_NAME} PRIVATE device/android) -target_include_directories(${PROJECT_NAME} PRIVATE device/decoder) -target_include_directories(${PROJECT_NAME} PRIVATE device/controller) -target_include_directories(${PROJECT_NAME} PRIVATE device/controller/receiver) -target_include_directories(${PROJECT_NAME} PRIVATE device/controller/inputconvert) -target_include_directories(${PROJECT_NAME} PRIVATE device/controller/inputconvert/keymap) -target_include_directories(${PROJECT_NAME} PRIVATE device/server) -target_include_directories(${PROJECT_NAME} PRIVATE device/stream) -target_include_directories(${PROJECT_NAME} PRIVATE device/render) -target_include_directories(${PROJECT_NAME} PRIVATE device/ui) -target_include_directories(${PROJECT_NAME} PRIVATE device/recorder) -target_include_directories(${PROJECT_NAME} PRIVATE devicemanage) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/filehandler) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/android) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/decoder) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/controller) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/controller/receiver) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/controller/inputconvert) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/controller/inputconvert/keymap) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/server) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/stream) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/render) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/ui) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/device/recorder) +target_include_directories(${PROJECT_NAME} PRIVATE QtScrcpyCore/src/devicemanage) target_include_directories(${PROJECT_NAME} PRIVATE fontawesome) target_include_directories(${PROJECT_NAME} PRIVATE util) target_include_directories(${PROJECT_NAME} PRIVATE uibase) diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro deleted file mode 100644 index 48edf14..0000000 --- a/QtScrcpy/QtScrcpy.pro +++ /dev/null @@ -1,214 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2018-10-07T12:36:10 -# -#------------------------------------------------- - -QT += core gui -QT += network - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = QtScrcpy -TEMPLATE = app - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which has been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -msvc{ - QMAKE_CFLAGS += -source-charset:utf-8 - QMAKE_CXXFLAGS += -source-charset:utf-8 -} - -# warning as error -#4566 https://github.com/Chuyu-Team/VC-LTL/issues/27 -*g++*: QMAKE_CXXFLAGS += -Werror -*msvc*: QMAKE_CXXFLAGS += /WX /wd4566 - -# run a server debugger and wait for a client to be attached -# DEFINES += SERVER_DEBUGGER -# select the debugger method ('old' for Android < 9, 'new' for Android >= 9) -# DEFINES += SERVER_DEBUGGER_METHOD_NEW - -# 源码 -SOURCES += \ - main.cpp - -# 子工程 -include ($$PWD/include/include.pri) -include ($$PWD/common/common.pri) -include ($$PWD/adb/adb.pri) -include ($$PWD/uibase/uibase.pri) -include ($$PWD/ui/ui.pri) -include ($$PWD/fontawesome/fontawesome.pri) -include ($$PWD/util/util.pri) -include ($$PWD/device/device.pri) -include ($$PWD/devicemanage/devicemanage.pri) - -# 附加包含路径 -INCLUDEPATH += \ - $$PWD/common \ - $$PWD/adb \ - $$PWD/uibase \ - $$PWD/ui \ - $$PWD/util \ - $$PWD/device \ - $$PWD/devicemanage \ - $$PWD/fontawesome - -# 如果变量没有定义 -# !defined(TEST_VAR, var) { -# message("test") -# } - -# 从文件读取版本号 -CAT_VERSION = $$cat($$PWD/version) -# 拆分出版本号 -VERSION_MAJOR = $$section(CAT_VERSION, ., 0, 0) -VERSION_MINOR = $$section(CAT_VERSION, ., 1, 1) -VERSION_PATCH = $$section(CAT_VERSION, ., 2, 2) -message("version:" $${VERSION_MAJOR}.$${VERSION_MINOR}.$${VERSION_PATCH}) - -# qmake变量的方式定义版本号 -VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR}.$${VERSION_PATCH} - -# *********************************************************** -# Win平台下配置 -# *********************************************************** -win32 { - # 通过rc的方式的话，VERSION变量rc中获取不到,定义为宏方便rc中使用 - DEFINES += VERSION_MAJOR=$${VERSION_MAJOR} - DEFINES += VERSION_MINOR=$${VERSION_MINOR} - DEFINES += VERSION_PATCH=$${VERSION_PATCH} - DEFINES += VERSION_RC_STR=\\\"$${VERSION_MAJOR}.$${VERSION_MINOR}.$${VERSION_PATCH}\\\" - - contains(QT_ARCH, x86_64) { - message("x64") - # 输出目录 - CONFIG(debug, debug|release) { - DESTDIR = $$PWD/../output/x64/debug - } else { - DESTDIR = $$PWD/../output/x64/release - } - - # 依赖模块 - LIBS += \ - -L$$PWD/../third_party/ffmpeg/lib/x64 -lavformat \ - -L$$PWD/../third_party/ffmpeg/lib/x64 -lavcodec \ - -L$$PWD/../third_party/ffmpeg/lib/x64 -lavutil \ - -L$$PWD/../third_party/ffmpeg/lib/x64 -lswscale - - WIN_FFMPEG_SRC = $$PWD/../third_party/ffmpeg/bin/x64/*.dll - } else { - message("x86") - # 输出目录 - CONFIG(debug, debug|release) { - DESTDIR = $$PWD/../output/x86/debug - } else { - DESTDIR = $$PWD/../output/x86/release - } - - # 依赖模块 - LIBS += \ - -L$$PWD/../third_party/ffmpeg/lib/x86 -lavformat \ - -L$$PWD/../third_party/ffmpeg/lib/x86 -lavcodec \ - -L$$PWD/../third_party/ffmpeg/lib/x86 -lavutil \ - -L$$PWD/../third_party/ffmpeg/lib/x86 -lswscale - - WIN_FFMPEG_SRC = $$PWD/../third_party/ffmpeg/bin/x86/*.dll - } - - # 复制依赖库 - WIN_DST = $$DESTDIR - - WIN_FFMPEG_SRC ~= s,/,\\,g - WIN_DST ~= s,/,\\,g - - QMAKE_POST_LINK += $$quote($$QMAKE_COPY $$WIN_FFMPEG_SRC $$WIN_DST$$escape_expand(\n\t)) - - # windows rc file - RC_FILE = $$PWD/res/QtScrcpy.rc -} - -# *********************************************************** -# Mac平台下配置 -# *********************************************************** -macos { - # 输出目录 - CONFIG(debug, debug|release) { - DESTDIR = $$PWD/../output/debug - } else { - DESTDIR = $$PWD/../output/release - } - - # 依赖模块 - LIBS += \ - -L$$PWD/../third_party/ffmpeg/lib -lavformat.58 \ - -L$$PWD/../third_party/ffmpeg/lib -lavcodec.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) - APP_SCRCPY_SERVER.path = Contents/MacOS - QMAKE_BUNDLE_DATA += APP_SCRCPY_SERVER - - APP_ADB.files = $$files($$PWD/../third_party/adb/mac/adb) - APP_ADB.path = Contents/MacOS - QMAKE_BUNDLE_DATA += APP_ADB - - APP_FFMPEG.files = $$files($$PWD/../third_party/ffmpeg/lib/*.dylib) - APP_FFMPEG.path = Contents/MacOS - QMAKE_BUNDLE_DATA += APP_FFMPEG - - APP_CONFIG.files = $$files($$PWD/../config/config.ini) - APP_CONFIG.path = Contents/MacOS/config - QMAKE_BUNDLE_DATA += APP_CONFIG - # mac application icon - ICON = $$PWD/res/QtScrcpy.icns - QMAKE_INFO_PLIST = $$PWD/res/Info_Mac.plist - - # 定义目标命令（修改版本号字段） - plistupdate.commands = /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $$VERSION\" \ - -c \"Set :CFBundleVersion $$VERSION\" \ - $$DESTDIR/$${TARGET}.app/Contents/Info.plist - - # 增加额外目标 - QMAKE_EXTRA_TARGETS += plistupdate - # 设置为前置依赖 - PRE_TARGETDEPS += plistupdate -} - -# *********************************************************** -# Linux平台下配置 -# *********************************************************** -linux { - # 输出目录 - CONFIG(debug, debug|release) { - DESTDIR = $$PWD/../output/debug - } else { - DESTDIR = $$PWD/../output/release - } - - # 依赖模块 - LIBS += \ - -L$$PWD/../third_party/ffmpeg/lib -lavformat \ - -L$$PWD/../third_party/ffmpeg/lib -lavcodec \ - -L$$PWD/../third_party/ffmpeg/lib -lavutil \ - -L$$PWD/../third_party/ffmpeg/lib -lswscale - - # linux set app icon: https://blog.csdn.net/MrNoboday/article/details/82870853 -} - -# message("test") - -RESOURCES += \ - res/res.qrc - diff --git a/QtScrcpy/include/QtScrcpyCore.h b/QtScrcpy/QtScrcpyCore/include/QtScrcpyCore.h similarity index 100% rename from QtScrcpy/include/QtScrcpyCore.h rename to QtScrcpy/QtScrcpyCore/include/QtScrcpyCore.h diff --git a/QtScrcpy/include/QtScrcpyCoreDef.h b/QtScrcpy/QtScrcpyCore/include/QtScrcpyCoreDef.h similarity index 100% rename from QtScrcpy/include/QtScrcpyCoreDef.h rename to QtScrcpy/QtScrcpyCore/include/QtScrcpyCoreDef.h diff --git a/QtScrcpy/include/include.pri b/QtScrcpy/QtScrcpyCore/include/include.pri similarity index 100% rename from QtScrcpy/include/include.pri rename to QtScrcpy/QtScrcpyCore/include/include.pri diff --git a/QtScrcpy/adb/adbprocess.cpp b/QtScrcpy/QtScrcpyCore/src/adb/adbprocess.cpp similarity index 100% rename from QtScrcpy/adb/adbprocess.cpp rename to QtScrcpy/QtScrcpyCore/src/adb/adbprocess.cpp diff --git a/QtScrcpy/adb/adbprocess.h b/QtScrcpy/QtScrcpyCore/src/adb/adbprocess.h similarity index 100% rename from QtScrcpy/adb/adbprocess.h rename to QtScrcpy/QtScrcpyCore/src/adb/adbprocess.h diff --git a/QtScrcpy/device/android/input.h b/QtScrcpy/QtScrcpyCore/src/device/android/input.h similarity index 100% rename from QtScrcpy/device/android/input.h rename to QtScrcpy/QtScrcpyCore/src/device/android/input.h diff --git a/QtScrcpy/device/android/keycodes.h b/QtScrcpy/QtScrcpyCore/src/device/android/keycodes.h similarity index 100% rename from QtScrcpy/device/android/keycodes.h rename to QtScrcpy/QtScrcpyCore/src/device/android/keycodes.h diff --git a/QtScrcpy/device/controller/controller.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/controller.cpp similarity index 100% rename from QtScrcpy/device/controller/controller.cpp rename to QtScrcpy/QtScrcpyCore/src/device/controller/controller.cpp diff --git a/QtScrcpy/device/controller/controller.h b/QtScrcpy/QtScrcpyCore/src/device/controller/controller.h similarity index 100% rename from QtScrcpy/device/controller/controller.h rename to QtScrcpy/QtScrcpyCore/src/device/controller/controller.h diff --git a/QtScrcpy/device/controller/inputconvert/controlmsg.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/controlmsg.cpp similarity index 100% rename from QtScrcpy/device/controller/inputconvert/controlmsg.cpp rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/controlmsg.cpp diff --git a/QtScrcpy/device/controller/inputconvert/controlmsg.h b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/controlmsg.h similarity index 100% rename from QtScrcpy/device/controller/inputconvert/controlmsg.h rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/controlmsg.h diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertbase.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertbase.cpp similarity index 100% rename from QtScrcpy/device/controller/inputconvert/inputconvertbase.cpp rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertbase.cpp diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertbase.h b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertbase.h similarity index 100% rename from QtScrcpy/device/controller/inputconvert/inputconvertbase.h rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertbase.h diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertgame.cpp similarity index 100% rename from QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertgame.cpp diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertgame.h b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertgame.h similarity index 100% rename from QtScrcpy/device/controller/inputconvert/inputconvertgame.h rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertgame.h diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertnormal.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertnormal.cpp similarity index 100% rename from QtScrcpy/device/controller/inputconvert/inputconvertnormal.cpp rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertnormal.cpp diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertnormal.h b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertnormal.h similarity index 100% rename from QtScrcpy/device/controller/inputconvert/inputconvertnormal.h rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/inputconvertnormal.h diff --git a/QtScrcpy/device/controller/inputconvert/keymap/keymap.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/keymap/keymap.cpp similarity index 100% rename from QtScrcpy/device/controller/inputconvert/keymap/keymap.cpp rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/keymap/keymap.cpp diff --git a/QtScrcpy/device/controller/inputconvert/keymap/keymap.h b/QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/keymap/keymap.h similarity index 100% rename from QtScrcpy/device/controller/inputconvert/keymap/keymap.h rename to QtScrcpy/QtScrcpyCore/src/device/controller/inputconvert/keymap/keymap.h diff --git a/QtScrcpy/device/controller/receiver/devicemsg.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/receiver/devicemsg.cpp similarity index 100% rename from QtScrcpy/device/controller/receiver/devicemsg.cpp rename to QtScrcpy/QtScrcpyCore/src/device/controller/receiver/devicemsg.cpp diff --git a/QtScrcpy/device/controller/receiver/devicemsg.h b/QtScrcpy/QtScrcpyCore/src/device/controller/receiver/devicemsg.h similarity index 100% rename from QtScrcpy/device/controller/receiver/devicemsg.h rename to QtScrcpy/QtScrcpyCore/src/device/controller/receiver/devicemsg.h diff --git a/QtScrcpy/device/controller/receiver/receiver.cpp b/QtScrcpy/QtScrcpyCore/src/device/controller/receiver/receiver.cpp similarity index 100% rename from QtScrcpy/device/controller/receiver/receiver.cpp rename to QtScrcpy/QtScrcpyCore/src/device/controller/receiver/receiver.cpp diff --git a/QtScrcpy/device/controller/receiver/receiver.h b/QtScrcpy/QtScrcpyCore/src/device/controller/receiver/receiver.h similarity index 100% rename from QtScrcpy/device/controller/receiver/receiver.h rename to QtScrcpy/QtScrcpyCore/src/device/controller/receiver/receiver.h diff --git a/QtScrcpy/device/decoder/avframeconvert.cpp b/QtScrcpy/QtScrcpyCore/src/device/decoder/avframeconvert.cpp similarity index 100% rename from QtScrcpy/device/decoder/avframeconvert.cpp rename to QtScrcpy/QtScrcpyCore/src/device/decoder/avframeconvert.cpp diff --git a/QtScrcpy/device/decoder/avframeconvert.h b/QtScrcpy/QtScrcpyCore/src/device/decoder/avframeconvert.h similarity index 100% rename from QtScrcpy/device/decoder/avframeconvert.h rename to QtScrcpy/QtScrcpyCore/src/device/decoder/avframeconvert.h diff --git a/QtScrcpy/device/decoder/decoder.cpp b/QtScrcpy/QtScrcpyCore/src/device/decoder/decoder.cpp similarity index 100% rename from QtScrcpy/device/decoder/decoder.cpp rename to QtScrcpy/QtScrcpyCore/src/device/decoder/decoder.cpp diff --git a/QtScrcpy/device/decoder/decoder.h b/QtScrcpy/QtScrcpyCore/src/device/decoder/decoder.h similarity index 100% rename from QtScrcpy/device/decoder/decoder.h rename to QtScrcpy/QtScrcpyCore/src/device/decoder/decoder.h diff --git a/QtScrcpy/device/decoder/fpscounter.cpp b/QtScrcpy/QtScrcpyCore/src/device/decoder/fpscounter.cpp similarity index 100% rename from QtScrcpy/device/decoder/fpscounter.cpp rename to QtScrcpy/QtScrcpyCore/src/device/decoder/fpscounter.cpp diff --git a/QtScrcpy/device/decoder/fpscounter.h b/QtScrcpy/QtScrcpyCore/src/device/decoder/fpscounter.h similarity index 100% rename from QtScrcpy/device/decoder/fpscounter.h rename to QtScrcpy/QtScrcpyCore/src/device/decoder/fpscounter.h diff --git a/QtScrcpy/device/decoder/videobuffer.cpp b/QtScrcpy/QtScrcpyCore/src/device/decoder/videobuffer.cpp similarity index 100% rename from QtScrcpy/device/decoder/videobuffer.cpp rename to QtScrcpy/QtScrcpyCore/src/device/decoder/videobuffer.cpp diff --git a/QtScrcpy/device/decoder/videobuffer.h b/QtScrcpy/QtScrcpyCore/src/device/decoder/videobuffer.h similarity index 100% rename from QtScrcpy/device/decoder/videobuffer.h rename to QtScrcpy/QtScrcpyCore/src/device/decoder/videobuffer.h diff --git a/QtScrcpy/device/device.cpp b/QtScrcpy/QtScrcpyCore/src/device/device.cpp similarity index 100% rename from QtScrcpy/device/device.cpp rename to QtScrcpy/QtScrcpyCore/src/device/device.cpp diff --git a/QtScrcpy/device/device.h b/QtScrcpy/QtScrcpyCore/src/device/device.h similarity index 98% rename from QtScrcpy/device/device.h rename to QtScrcpy/QtScrcpyCore/src/device/device.h index feafdbf..180ceb3 100644 --- a/QtScrcpy/device/device.h +++ b/QtScrcpy/QtScrcpyCore/src/device/device.h @@ -6,7 +6,7 @@ #include #include -#include "../include/QtScrcpyCore.h" +#include "../../include/QtScrcpyCore.h" #include "controlmsg.h" diff --git a/QtScrcpy/device/filehandler/filehandler.cpp b/QtScrcpy/QtScrcpyCore/src/device/filehandler/filehandler.cpp similarity index 100% rename from QtScrcpy/device/filehandler/filehandler.cpp rename to QtScrcpy/QtScrcpyCore/src/device/filehandler/filehandler.cpp diff --git a/QtScrcpy/device/filehandler/filehandler.h b/QtScrcpy/QtScrcpyCore/src/device/filehandler/filehandler.h similarity index 100% rename from QtScrcpy/device/filehandler/filehandler.h rename to QtScrcpy/QtScrcpyCore/src/device/filehandler/filehandler.h diff --git a/QtScrcpy/device/recorder/recorder.cpp b/QtScrcpy/QtScrcpyCore/src/device/recorder/recorder.cpp similarity index 100% rename from QtScrcpy/device/recorder/recorder.cpp rename to QtScrcpy/QtScrcpyCore/src/device/recorder/recorder.cpp diff --git a/QtScrcpy/device/recorder/recorder.h b/QtScrcpy/QtScrcpyCore/src/device/recorder/recorder.h similarity index 100% rename from QtScrcpy/device/recorder/recorder.h rename to QtScrcpy/QtScrcpyCore/src/device/recorder/recorder.h diff --git a/QtScrcpy/device/render/qyuvopenglwidget.cpp b/QtScrcpy/QtScrcpyCore/src/device/render/qyuvopenglwidget.cpp similarity index 100% rename from QtScrcpy/device/render/qyuvopenglwidget.cpp rename to QtScrcpy/QtScrcpyCore/src/device/render/qyuvopenglwidget.cpp diff --git a/QtScrcpy/device/render/qyuvopenglwidget.h b/QtScrcpy/QtScrcpyCore/src/device/render/qyuvopenglwidget.h similarity index 100% rename from QtScrcpy/device/render/qyuvopenglwidget.h rename to QtScrcpy/QtScrcpyCore/src/device/render/qyuvopenglwidget.h diff --git a/QtScrcpy/device/server/server.cpp b/QtScrcpy/QtScrcpyCore/src/device/server/server.cpp similarity index 100% rename from QtScrcpy/device/server/server.cpp rename to QtScrcpy/QtScrcpyCore/src/device/server/server.cpp diff --git a/QtScrcpy/device/server/server.h b/QtScrcpy/QtScrcpyCore/src/device/server/server.h similarity index 100% rename from QtScrcpy/device/server/server.h rename to QtScrcpy/QtScrcpyCore/src/device/server/server.h diff --git a/QtScrcpy/device/server/tcpserver.cpp b/QtScrcpy/QtScrcpyCore/src/device/server/tcpserver.cpp similarity index 100% rename from QtScrcpy/device/server/tcpserver.cpp rename to QtScrcpy/QtScrcpyCore/src/device/server/tcpserver.cpp diff --git a/QtScrcpy/device/server/tcpserver.h b/QtScrcpy/QtScrcpyCore/src/device/server/tcpserver.h similarity index 100% rename from QtScrcpy/device/server/tcpserver.h rename to QtScrcpy/QtScrcpyCore/src/device/server/tcpserver.h diff --git a/QtScrcpy/device/server/videosocket.cpp b/QtScrcpy/QtScrcpyCore/src/device/server/videosocket.cpp similarity index 100% rename from QtScrcpy/device/server/videosocket.cpp rename to QtScrcpy/QtScrcpyCore/src/device/server/videosocket.cpp diff --git a/QtScrcpy/device/server/videosocket.h b/QtScrcpy/QtScrcpyCore/src/device/server/videosocket.h similarity index 100% rename from QtScrcpy/device/server/videosocket.h rename to QtScrcpy/QtScrcpyCore/src/device/server/videosocket.h diff --git a/QtScrcpy/device/stream/stream.cpp b/QtScrcpy/QtScrcpyCore/src/device/stream/stream.cpp similarity index 100% rename from QtScrcpy/device/stream/stream.cpp rename to QtScrcpy/QtScrcpyCore/src/device/stream/stream.cpp diff --git a/QtScrcpy/device/stream/stream.h b/QtScrcpy/QtScrcpyCore/src/device/stream/stream.h similarity index 100% rename from QtScrcpy/device/stream/stream.h rename to QtScrcpy/QtScrcpyCore/src/device/stream/stream.h diff --git a/QtScrcpy/devicemanage/devicemanage.cpp b/QtScrcpy/QtScrcpyCore/src/devicemanage/devicemanage.cpp similarity index 100% rename from QtScrcpy/devicemanage/devicemanage.cpp rename to QtScrcpy/QtScrcpyCore/src/devicemanage/devicemanage.cpp diff --git a/QtScrcpy/devicemanage/devicemanage.h b/QtScrcpy/QtScrcpyCore/src/devicemanage/devicemanage.h similarity index 95% rename from QtScrcpy/devicemanage/devicemanage.h rename to QtScrcpy/QtScrcpyCore/src/devicemanage/devicemanage.h index d4decb1..93b3c2d 100644 --- a/QtScrcpy/devicemanage/devicemanage.h +++ b/QtScrcpy/QtScrcpyCore/src/devicemanage/devicemanage.h @@ -4,7 +4,7 @@ #include #include -#include "../include/QtScrcpyCore.h" +#include "../../include/QtScrcpyCore.h" namespace qsc { diff --git a/QtScrcpy/adb/adb.pri b/QtScrcpy/adb/adb.pri deleted file mode 100644 index 762cbac..0000000 --- a/QtScrcpy/adb/adb.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - $$PWD/adbprocess.h - -SOURCES += \ - $$PWD/adbprocess.cpp diff --git a/QtScrcpy/device/android/android.pri b/QtScrcpy/device/android/android.pri deleted file mode 100644 index 0b6db18..0000000 --- a/QtScrcpy/device/android/android.pri +++ /dev/null @@ -1,3 +0,0 @@ -HEADERS += \ - $$PWD/input.h \ - $$PWD/keycodes.h diff --git a/QtScrcpy/device/controller/controller.pri b/QtScrcpy/device/controller/controller.pri deleted file mode 100644 index 5088569..0000000 --- a/QtScrcpy/device/controller/controller.pri +++ /dev/null @@ -1,14 +0,0 @@ -HEADERS += \ - $$PWD/controller.h - -SOURCES += \ - $$PWD/controller.cpp - -include ($$PWD/receiver/receiver.pri) -include ($$PWD/inputconvert/inputconvert.pri) - -INCLUDEPATH += \ - $$PWD/receiver \ - $$PWD/inputconvert - - diff --git a/QtScrcpy/device/controller/inputconvert/inputconvert.pri b/QtScrcpy/device/controller/inputconvert/inputconvert.pri deleted file mode 100644 index 5b8763f..0000000 --- a/QtScrcpy/device/controller/inputconvert/inputconvert.pri +++ /dev/null @@ -1,17 +0,0 @@ -HEADERS += \ - $$PWD/inputconvertbase.h \ - $$PWD/inputconvertgame.h \ - $$PWD/inputconvertnormal.h \ - $$PWD/controlmsg.h - -SOURCES += \ - $$PWD/inputconvertbase.cpp \ - $$PWD/inputconvertgame.cpp \ - $$PWD/inputconvertnormal.cpp \ - $$PWD/controlmsg.cpp - -include ($$PWD/keymap/keymap.pri) - -INCLUDEPATH += \ - $$PWD/keymap - diff --git a/QtScrcpy/device/controller/inputconvert/keymap/keymap.pri b/QtScrcpy/device/controller/inputconvert/keymap/keymap.pri deleted file mode 100644 index 825b777..0000000 --- a/QtScrcpy/device/controller/inputconvert/keymap/keymap.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - $$PWD/keymap.h - -SOURCES += \ - $$PWD/keymap.cpp diff --git a/QtScrcpy/device/controller/receiver/receiver.pri b/QtScrcpy/device/controller/receiver/receiver.pri deleted file mode 100644 index 324cad4..0000000 --- a/QtScrcpy/device/controller/receiver/receiver.pri +++ /dev/null @@ -1,7 +0,0 @@ -HEADERS += \ - $$PWD/devicemsg.h \ - $$PWD/receiver.h - -SOURCES += \ - $$PWD/devicemsg.cpp \ - $$PWD/receiver.cpp diff --git a/QtScrcpy/device/decoder/decoder.pri b/QtScrcpy/device/decoder/decoder.pri deleted file mode 100644 index 8618ad0..0000000 --- a/QtScrcpy/device/decoder/decoder.pri +++ /dev/null @@ -1,11 +0,0 @@ -HEADERS += \ - $$PWD/decoder.h \ - $$PWD/fpscounter.h \ - $$PWD/avframeconvert.h \ - $$PWD/videobuffer.h - -SOURCES += \ - $$PWD/decoder.cpp \ - $$PWD/fpscounter.cpp \ - $$PWD/avframeconvert.cpp \ - $$PWD/videobuffer.cpp diff --git a/QtScrcpy/device/device.pri b/QtScrcpy/device/device.pri deleted file mode 100644 index 197e72e..0000000 --- a/QtScrcpy/device/device.pri +++ /dev/null @@ -1,25 +0,0 @@ -HEADERS += \ - $$PWD/device.h - -SOURCES += \ - $$PWD/device.cpp - -include ($$PWD/server/server.pri) -include ($$PWD/decoder/decoder.pri) -include ($$PWD/render/render.pri) -include ($$PWD/stream/stream.pri) -include ($$PWD/android/android.pri) -include ($$PWD/controller/controller.pri) -include ($$PWD/filehandler/filehandler.pri) -include ($$PWD/recorder/recorder.pri) - -INCLUDEPATH += \ - $$PWD/../../third_party/ffmpeg/include \ - $$PWD/server \ - $$PWD/decoder \ - $$PWD/render \ - $$PWD/stream \ - $$PWD/android \ - $$PWD/controller \ - $$PWD/filehandler \ - $$PWD/recorder diff --git a/QtScrcpy/device/filehandler/filehandler.pri b/QtScrcpy/device/filehandler/filehandler.pri deleted file mode 100644 index d74f234..0000000 --- a/QtScrcpy/device/filehandler/filehandler.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - $$PWD/filehandler.h - -SOURCES += \ - $$PWD/filehandler.cpp diff --git a/QtScrcpy/device/recorder/recorder.pri b/QtScrcpy/device/recorder/recorder.pri deleted file mode 100644 index ec33f7e..0000000 --- a/QtScrcpy/device/recorder/recorder.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - $$PWD/recorder.h - -SOURCES += \ - $$PWD/recorder.cpp diff --git a/QtScrcpy/device/render/render.pri b/QtScrcpy/device/render/render.pri deleted file mode 100644 index 357d548..0000000 --- a/QtScrcpy/device/render/render.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - $$PWD/qyuvopenglwidget.h - -SOURCES += \ - $$PWD/qyuvopenglwidget.cpp diff --git a/QtScrcpy/device/server/server.pri b/QtScrcpy/device/server/server.pri deleted file mode 100644 index d890771..0000000 --- a/QtScrcpy/device/server/server.pri +++ /dev/null @@ -1,9 +0,0 @@ -HEADERS += \ - $$PWD/server.h \ - $$PWD/tcpserver.h \ - $$PWD/videosocket.h - -SOURCES += \ - $$PWD/server.cpp \ - $$PWD/tcpserver.cpp \ - $$PWD/videosocket.cpp diff --git a/QtScrcpy/device/stream/stream.pri b/QtScrcpy/device/stream/stream.pri deleted file mode 100644 index 9d7c358..0000000 --- a/QtScrcpy/device/stream/stream.pri +++ /dev/null @@ -1,6 +0,0 @@ -HEADERS += \ - $$PWD/stream.h - -SOURCES += \ - $$PWD/stream.cpp - diff --git a/QtScrcpy/devicemanage/devicemanage.pri b/QtScrcpy/devicemanage/devicemanage.pri deleted file mode 100644 index 8b2ff86..0000000 --- a/QtScrcpy/devicemanage/devicemanage.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - $$PWD/devicemanage.h - -SOURCES += \ - $$PWD/devicemanage.cpp diff --git a/QtScrcpy/fontawesome/fontawesome.pri b/QtScrcpy/fontawesome/fontawesome.pri deleted file mode 100644 index 36be843..0000000 --- a/QtScrcpy/fontawesome/fontawesome.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - $$PWD/iconhelper.h - -SOURCES += \ - $$PWD/iconhelper.cpp diff --git a/QtScrcpy/ui/dialog.h b/QtScrcpy/ui/dialog.h index 39044c1..558622f 100644 --- a/QtScrcpy/ui/dialog.h +++ b/QtScrcpy/ui/dialog.h @@ -10,7 +10,7 @@ #include "adbprocess.h" -#include "../include/QtScrcpyCore.h" +#include "../QtScrcpyCore/include/QtScrcpyCore.h" namespace Ui { diff --git a/QtScrcpy/ui/toolform.h b/QtScrcpy/ui/toolform.h index 908b190..df75d7d 100644 --- a/QtScrcpy/ui/toolform.h +++ b/QtScrcpy/ui/toolform.h @@ -4,7 +4,7 @@ #include #include -#include "../include/QtScrcpyCore.h" +#include "../QtScrcpyCore/include/QtScrcpyCore.h" #include "magneticwidget.h" namespace Ui diff --git a/QtScrcpy/ui/ui.pri b/QtScrcpy/ui/ui.pri deleted file mode 100644 index 6d1f1a2..0000000 --- a/QtScrcpy/ui/ui.pri +++ /dev/null @@ -1,14 +0,0 @@ -SOURCES += \ - $$PWD/videoform.cpp \ - $$PWD/toolform.cpp \ - $$PWD/dialog.cpp - -HEADERS += \ - $$PWD/videoform.h \ - $$PWD/toolform.h \ - $$PWD/dialog.h - -FORMS += \ - $$PWD/videoform.ui \ - $$PWD/toolform.ui \ - $$PWD/dialog.ui diff --git a/QtScrcpy/ui/videoform.h b/QtScrcpy/ui/videoform.h index e227e14..047846b 100644 --- a/QtScrcpy/ui/videoform.h +++ b/QtScrcpy/ui/videoform.h @@ -4,7 +4,7 @@ #include #include -#include "../include/QtScrcpyCore.h" +#include "../QtScrcpyCore/include/QtScrcpyCore.h" namespace Ui { diff --git a/QtScrcpy/uibase/uibase.pri b/QtScrcpy/uibase/uibase.pri deleted file mode 100644 index cac526a..0000000 --- a/QtScrcpy/uibase/uibase.pri +++ /dev/null @@ -1,9 +0,0 @@ -FORMS += - -HEADERS += \ - $$PWD/keepratiowidget.h \ - $$PWD/magneticwidget.h - -SOURCES += \ - $$PWD/keepratiowidget.cpp \ - $$PWD/magneticwidget.cpp diff --git a/QtScrcpy/util/mousetap/mousetap.pri b/QtScrcpy/util/mousetap/mousetap.pri deleted file mode 100644 index 4bc8b4e..0000000 --- a/QtScrcpy/util/mousetap/mousetap.pri +++ /dev/null @@ -1,25 +0,0 @@ -HEADERS += \ - $$PWD/mousetap.h - -SOURCES += \ - $$PWD/mousetap.cpp - -win32 { - HEADERS += $$PWD/winmousetap.h - SOURCES += $$PWD/winmousetap.cpp - LIBS += -lUser32 -} - -mac { - HEADERS += $$PWD/cocoamousetap.h - OBJECTIVE_SOURCES += $$PWD/cocoamousetap.mm - LIBS += -framework Appkit - QMAKE_CFLAGS += -mmacosx-version-min=10.6 -} - -linux { - HEADERS += $$PWD/xmousetap.h - SOURCES += $$PWD/xmousetap.cpp - LIBS += -lxcb - QT += x11extras -} diff --git a/QtScrcpy/util/util.pri b/QtScrcpy/util/util.pri deleted file mode 100644 index 3c8c77b..0000000 --- a/QtScrcpy/util/util.pri +++ /dev/null @@ -1,10 +0,0 @@ -include ($$PWD/mousetap/mousetap.pri) - -HEADERS += \ - $$PWD/compat.h \ - $$PWD/bufferutil.h \ - $$PWD/config.h - -SOURCES += \ - $$PWD/bufferutil.cpp \ - $$PWD/config.cpp