From 761a871dbf4f1fea5fdf35a36c45ec3a10350e18 Mon Sep 17 00:00:00 2001
From: barry <870709864@qq.com>
Date: Sun, 25 Nov 2018 21:36:36 +0800
Subject: [PATCH] linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

linux编译通过
---
 QtScrcpy/QtScrcpy.pro    | 29 ++++++++++++++++++++++++++---
 QtScrcpy/main.cpp        |  9 +++++++--
 QtScrcpy/server/server.h |  2 +-
 3 files changed, 34 insertions(+), 6 deletions(-)

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 <QObject>
 #include <QPointer>
 
-#include "tcpServer.h"
+#include "tcpserver.h"
 #include "devicesocket.h"
 #include "adbprocess.h"