diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro index d3468c5..e06ead7 100644 --- a/QtScrcpy/QtScrcpy.pro +++ b/QtScrcpy/QtScrcpy.pro @@ -73,8 +73,8 @@ win32 { # 依赖模块 LIBS += \ - -L$$PWD/../third_party/ffmpeg/lib -lavcodec \ -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 \ -lUser32 @@ -96,8 +96,8 @@ macos { # 依赖模块 LIBS += \ - -L$$PWD/../third_party/ffmpeg/lib -lavcodec.58 \ -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 @@ -106,7 +106,7 @@ macos { APP_SCRCPY_SERVER.path = Contents/MacOS QMAKE_BUNDLE_DATA += APP_SCRCPY_SERVER - APP_ADB.files = $$files($$PWD/../third_party/adb/adb) + APP_ADB.files = $$files($$PWD/../third_party/adb/mac/adb) APP_ADB.path = Contents/MacOS QMAKE_BUNDLE_DATA += APP_ADB @@ -114,6 +114,29 @@ macos { ICON = $$PWD/res/QtScrcpy.icns } +# *********************************************************** +# Linux平台下配置 +# *********************************************************** +linux { + # 输出目录 + CONFIG(debug, debug|release) { + DESTDIR = $$PWD/../output/linux/debug + } else { + DESTDIR = $$PWD/../output/linux/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.qrc diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp index 7e27253..c0339e7 100644 --- a/QtScrcpy/main.cpp +++ b/QtScrcpy/main.cpp @@ -15,14 +15,19 @@ int main(int argc, char *argv[]) { //QApplication::setAttribute(Qt::AA_UseDesktopOpenGL); //QApplication::setAttribute(Qt::AA_UseOpenGLES); - //QApplication::setAttribute(Qt::AA_UseSoftwareOpenGL); + //QApplication::setAttribute(Qt::AA_UseSoftwareOpenGL); g_oldMessageHandler = qInstallMessageHandler(myMessageOutput); Decoder::init(); QApplication a(argc, argv); #ifdef Q_OS_WIN32 - qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/adb.exe"); + qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/win/adb.exe"); + qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server.jar"); +#endif + +#ifdef Q_OS_LINUX + qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/linux/adb"); qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server.jar"); #endif diff --git a/QtScrcpy/server/server.h b/QtScrcpy/server/server.h index 9324538..1091aac 100644 --- a/QtScrcpy/server/server.h +++ b/QtScrcpy/server/server.h @@ -4,7 +4,7 @@ #include #include -#include "tcpServer.h" +#include "tcpserver.h" #include "devicesocket.h" #include "adbprocess.h" diff --git a/backup/ffmpeg-4.0.2.tar.xz b/backup/ffmpeg-4.0.2.tar.xz new file mode 100755 index 0000000..f378dcd Binary files /dev/null and b/backup/ffmpeg-4.0.2.tar.xz differ diff --git a/third_party/adb/linux/adb b/third_party/adb/linux/adb new file mode 100755 index 0000000..afa4cd8 Binary files /dev/null and b/third_party/adb/linux/adb differ diff --git a/third_party/adb/adb b/third_party/adb/mac/adb similarity index 100% rename from third_party/adb/adb rename to third_party/adb/mac/adb diff --git a/third_party/adb/AdbWinApi.dll b/third_party/adb/win/AdbWinApi.dll similarity index 100% rename from third_party/adb/AdbWinApi.dll rename to third_party/adb/win/AdbWinApi.dll diff --git a/third_party/adb/AdbWinUsbApi.dll b/third_party/adb/win/AdbWinUsbApi.dll similarity index 100% rename from third_party/adb/AdbWinUsbApi.dll rename to third_party/adb/win/AdbWinUsbApi.dll diff --git a/third_party/adb/adb.exe b/third_party/adb/win/adb.exe similarity index 100% rename from third_party/adb/adb.exe rename to third_party/adb/win/adb.exe diff --git a/third_party/ffmpeg/lib/libavcodec.a b/third_party/ffmpeg/lib/libavcodec.a new file mode 100644 index 0000000..0f9e97d Binary files /dev/null and b/third_party/ffmpeg/lib/libavcodec.a differ diff --git a/third_party/ffmpeg/lib/libavformat.a b/third_party/ffmpeg/lib/libavformat.a new file mode 100644 index 0000000..8216e79 Binary files /dev/null and b/third_party/ffmpeg/lib/libavformat.a differ diff --git a/third_party/ffmpeg/lib/libavutil.a b/third_party/ffmpeg/lib/libavutil.a new file mode 100644 index 0000000..05777fe Binary files /dev/null and b/third_party/ffmpeg/lib/libavutil.a differ diff --git a/third_party/ffmpeg/lib/libswresample.a b/third_party/ffmpeg/lib/libswresample.a new file mode 100644 index 0000000..7fd9aaa Binary files /dev/null and b/third_party/ffmpeg/lib/libswresample.a differ diff --git a/third_party/ffmpeg/lib/libswscale.a b/third_party/ffmpeg/lib/libswscale.a new file mode 100644 index 0000000..96f9cbf Binary files /dev/null and b/third_party/ffmpeg/lib/libswscale.a differ