diff --git a/src/AdbWinApi.dll b/output/debug/AdbWinApi.dll similarity index 100% rename from src/AdbWinApi.dll rename to output/debug/AdbWinApi.dll diff --git a/src/AdbWinUsbApi.dll b/output/debug/AdbWinUsbApi.dll similarity index 100% rename from src/AdbWinUsbApi.dll rename to output/debug/AdbWinUsbApi.dll diff --git a/src/adb.exe b/output/debug/adb.exe similarity index 100% rename from src/adb.exe rename to output/debug/adb.exe diff --git a/output/debug/avcodec-58.dll b/output/debug/avcodec-58.dll new file mode 100644 index 0000000..546a2af Binary files /dev/null and b/output/debug/avcodec-58.dll differ diff --git a/output/debug/avformat-58.dll b/output/debug/avformat-58.dll new file mode 100644 index 0000000..8509d19 Binary files /dev/null and b/output/debug/avformat-58.dll differ diff --git a/output/debug/avutil-56.dll b/output/debug/avutil-56.dll new file mode 100644 index 0000000..5a8d7da Binary files /dev/null and b/output/debug/avutil-56.dll differ diff --git a/src/scrcpy-server.jar b/output/debug/scrcpy-server.jar similarity index 100% rename from src/scrcpy-server.jar rename to output/debug/scrcpy-server.jar diff --git a/output/debug/swresample-3.dll b/output/debug/swresample-3.dll new file mode 100644 index 0000000..b02035e Binary files /dev/null and b/output/debug/swresample-3.dll differ diff --git a/output/debug/swscale-5.dll b/output/debug/swscale-5.dll new file mode 100644 index 0000000..9b12190 Binary files /dev/null and b/output/debug/swscale-5.dll differ diff --git a/output/release/AdbWinApi.dll b/output/release/AdbWinApi.dll new file mode 100644 index 0000000..7abe26c Binary files /dev/null and b/output/release/AdbWinApi.dll differ diff --git a/output/release/AdbWinUsbApi.dll b/output/release/AdbWinUsbApi.dll new file mode 100644 index 0000000..e7a6de1 Binary files /dev/null and b/output/release/AdbWinUsbApi.dll differ diff --git a/output/release/adb.exe b/output/release/adb.exe new file mode 100644 index 0000000..ef0a407 Binary files /dev/null and b/output/release/adb.exe differ diff --git a/output/release/avcodec-58.dll b/output/release/avcodec-58.dll new file mode 100644 index 0000000..546a2af Binary files /dev/null and b/output/release/avcodec-58.dll differ diff --git a/output/release/avformat-58.dll b/output/release/avformat-58.dll new file mode 100644 index 0000000..8509d19 Binary files /dev/null and b/output/release/avformat-58.dll differ diff --git a/output/release/avutil-56.dll b/output/release/avutil-56.dll new file mode 100644 index 0000000..5a8d7da Binary files /dev/null and b/output/release/avutil-56.dll differ diff --git a/output/release/scrcpy-server.jar b/output/release/scrcpy-server.jar new file mode 100644 index 0000000..3dcf27d Binary files /dev/null and b/output/release/scrcpy-server.jar differ diff --git a/output/release/swresample-3.dll b/output/release/swresample-3.dll new file mode 100644 index 0000000..b02035e Binary files /dev/null and b/output/release/swresample-3.dll differ diff --git a/output/release/swscale-5.dll b/output/release/swscale-5.dll new file mode 100644 index 0000000..9b12190 Binary files /dev/null and b/output/release/swscale-5.dll differ diff --git a/src/QtScrcpy.pro b/src/QtScrcpy.pro index c53bad3..9ae4d1e 100644 --- a/src/QtScrcpy.pro +++ b/src/QtScrcpy.pro @@ -39,7 +39,14 @@ FORMS += \ dialog.ui \ videoform.ui -#子工程 +# 指定可执行程序输出目录 +CONFIG(debug, debug|release) { + DESTDIR = $$PWD/../output/debug +} else { + DESTDIR = $$PWD/../output/release +} + +# 子工程 include ($$PWD/common/common.pri) include ($$PWD/server/server.pri) include ($$PWD/adb/adb.pri) diff --git a/src/adb/adbprocess.cpp b/src/adb/adbprocess.cpp index 99b8705..ad95e5d 100644 --- a/src/adb/adbprocess.cpp +++ b/src/adb/adbprocess.cpp @@ -1,9 +1,9 @@ -#include "adbprocess.h" - #include #include #include +#include "adbprocess.h" + QString AdbProcess::s_adbPath = ""; AdbProcess::AdbProcess(QObject *parent) @@ -24,7 +24,7 @@ const QString& AdbProcess::getAdbPath() if (s_adbPath.isEmpty()) { s_adbPath = QString::fromLocal8Bit(qgetenv("QTSCRCPY_ADB_PATH")); if (s_adbPath.isEmpty()) { - s_adbPath = "adb"; + s_adbPath = QCoreApplication::applicationDirPath() + "/adb"; } } return s_adbPath; @@ -49,7 +49,7 @@ void AdbProcess::initSignals() }); connect(this, &QProcess::errorOccurred, this, - [this](QProcess::ProcessError error){ + [this](QProcess::ProcessError error){ if (QProcess::FailedToStart == error) { emit adbProcessResult(AER_ERROR_MISSING_BINARY); } else { @@ -86,7 +86,6 @@ void AdbProcess::execute(const QString& serial, const QStringList& args) adbArgs << args; qDebug() << getAdbPath() << adbArgs.join(" "); start(getAdbPath(), adbArgs); - //start("C:\\Users\\Barry\\Desktop\\sockettool.exe", Q_NULLPTR); } bool AdbProcess::isRuning() diff --git a/src/main.cpp b/src/main.cpp index bec5615..ad2d5da 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,8 +15,8 @@ int main(int argc, char *argv[]) Decoder::init(); QApplication a(argc, argv); - qputenv("QTSCRCPY_ADB_PATH", "G:\\mygitcode\\QtScrcpy\\src\\adb.exe"); - qputenv("QTSCRCPY_SERVER_PATH", "G:\\mygitcode\\QtScrcpy\\src\\scrcpy-server.jar"); + //qputenv("QTSCRCPY_ADB_PATH", "G:\\mygitcode\\QtScrcpy\\src\\adb.exe"); + //qputenv("QTSCRCPY_SERVER_PATH", "G:\\mygitcode\\QtScrcpy\\src\\scrcpy-server.jar"); Dialog* w = new Dialog; w->show(); diff --git a/src/server/server.cpp b/src/server/server.cpp index bd3ee7f..4fc2ec8 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "server.h" @@ -52,7 +53,7 @@ const QString& Server::getServerPath() if (m_serverPath.isEmpty()) { m_serverPath = QString::fromLocal8Bit(qgetenv("QTSCRCPY_SERVER_PATH")); if (m_serverPath.isEmpty()) { - m_serverPath = "scrcpy-server.jar"; + m_serverPath = QCoreApplication::applicationDirPath() + "/scrcpy-server.jar"; } } return m_serverPath;