diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro index 05ad9d7..346e6d0 100644 --- a/QtScrcpy/QtScrcpy.pro +++ b/QtScrcpy/QtScrcpy.pro @@ -65,33 +65,46 @@ win32 { message("x64") # 输出目录 CONFIG(debug, debug|release) { - DESTDIR = $$PWD/../output/win-x64/debug + DESTDIR = $$PWD/../output/win/x64/debug } else { - DESTDIR = $$PWD/../output/win-x64/release + DESTDIR = $$PWD/../output/win/x64/release } # 依赖模块 LIBS += \ - -L$$PWD/../third_party/ffmpeg/win64/lib -lavformat \ - -L$$PWD/../third_party/ffmpeg/win64/lib -lavcodec \ - -L$$PWD/../third_party/ffmpeg/win64/lib -lavutil \ - -L$$PWD/../third_party/ffmpeg/win64/lib -lswscale + -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/win/debug + DESTDIR = $$PWD/../output/win/x86/debug } else { - DESTDIR = $$PWD/../output/win/release + DESTDIR = $$PWD/../output/win/x86/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 + -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 } diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp index 2642721..d2be9b2 100644 --- a/QtScrcpy/main.cpp +++ b/QtScrcpy/main.cpp @@ -31,9 +31,9 @@ int main(int argc, char *argv[]) #endif #ifdef Q_OS_WIN32 - qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/win/adb.exe"); - qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server.jar"); - qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap"); + qputenv("QTSCRCPY_ADB_PATH", "../../../../third_party/adb/win/adb.exe"); + qputenv("QTSCRCPY_SERVER_PATH", "../../../../third_party/scrcpy-server.jar"); + qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../keymap"); #endif #ifdef Q_OS_LINUX diff --git a/output/win-x64/release/avcodec-58.dll b/output/win-x64/release/avcodec-58.dll deleted file mode 100644 index 622bcf1..0000000 Binary files a/output/win-x64/release/avcodec-58.dll and /dev/null differ diff --git a/output/win-x64/release/avformat-58.dll b/output/win-x64/release/avformat-58.dll deleted file mode 100644 index 3c06eea..0000000 Binary files a/output/win-x64/release/avformat-58.dll and /dev/null differ diff --git a/output/win-x64/release/avutil-56.dll b/output/win-x64/release/avutil-56.dll deleted file mode 100644 index 7124f61..0000000 Binary files a/output/win-x64/release/avutil-56.dll and /dev/null differ diff --git a/output/win-x64/release/swresample-3.dll b/output/win-x64/release/swresample-3.dll deleted file mode 100644 index 9a9ff3c..0000000 Binary files a/output/win-x64/release/swresample-3.dll and /dev/null differ diff --git a/output/win-x64/release/swscale-5.dll b/output/win-x64/release/swscale-5.dll deleted file mode 100644 index bce9a6e..0000000 Binary files a/output/win-x64/release/swscale-5.dll and /dev/null differ diff --git a/output/win/release/avcodec-58.dll b/output/win/release/avcodec-58.dll deleted file mode 100644 index 2c51657..0000000 Binary files a/output/win/release/avcodec-58.dll and /dev/null differ diff --git a/output/win/release/avformat-58.dll b/output/win/release/avformat-58.dll deleted file mode 100644 index 4fd5652..0000000 Binary files a/output/win/release/avformat-58.dll and /dev/null differ diff --git a/output/win/release/avutil-56.dll b/output/win/release/avutil-56.dll deleted file mode 100644 index 031956b..0000000 Binary files a/output/win/release/avutil-56.dll and /dev/null differ diff --git a/output/win/release/swresample-3.dll b/output/win/release/swresample-3.dll deleted file mode 100644 index 1cd1e70..0000000 Binary files a/output/win/release/swresample-3.dll and /dev/null differ diff --git a/output/win/release/swscale-5.dll b/output/win/release/swscale-5.dll deleted file mode 100644 index 502cea7..0000000 Binary files a/output/win/release/swscale-5.dll and /dev/null differ diff --git a/publish_for_win.bat b/publish_for_win.bat index 5dfe0c2..470508d 100644 --- a/publish_for_win.bat +++ b/publish_for_win.bat @@ -24,11 +24,11 @@ set keymap_path=%script_path%keymap if /i %cpu_mode% == x86 ( set publish_path=%script_path%QtScrcpy-win32\ - set release_path=%script_path%output\win\release + set release_path=%script_path%output\win\x86\release set qt_msvc_path=%qt_msvc_path%msvc2017\bin ) else ( set publish_path=%script_path%QtScrcpy-win64\ - set release_path=%script_path%output\win-x64\release + set release_path=%script_path%output\win\x64\release set qt_msvc_path=%qt_msvc_path%msvc2017_64\bin ) set PATH=%qt_msvc_path%;%PATH% diff --git a/third_party/ffmpeg/bin/avcodec-58.dll b/third_party/ffmpeg/bin/avcodec-58.dll deleted file mode 100644 index 2c51657..0000000 Binary files a/third_party/ffmpeg/bin/avcodec-58.dll and /dev/null differ diff --git a/third_party/ffmpeg/bin/avformat-58.dll b/third_party/ffmpeg/bin/avformat-58.dll deleted file mode 100644 index 4fd5652..0000000 Binary files a/third_party/ffmpeg/bin/avformat-58.dll and /dev/null differ diff --git a/third_party/ffmpeg/bin/avutil-56.dll b/third_party/ffmpeg/bin/avutil-56.dll deleted file mode 100644 index 031956b..0000000 Binary files a/third_party/ffmpeg/bin/avutil-56.dll and /dev/null differ diff --git a/third_party/ffmpeg/bin/swresample-3.dll b/third_party/ffmpeg/bin/swresample-3.dll deleted file mode 100644 index 1cd1e70..0000000 Binary files a/third_party/ffmpeg/bin/swresample-3.dll and /dev/null differ diff --git a/third_party/ffmpeg/bin/swscale-5.dll b/third_party/ffmpeg/bin/swscale-5.dll deleted file mode 100644 index 502cea7..0000000 Binary files a/third_party/ffmpeg/bin/swscale-5.dll and /dev/null differ diff --git a/output/win-x64/debug/avcodec-58.dll b/third_party/ffmpeg/bin/x64/avcodec-58.dll similarity index 100% rename from output/win-x64/debug/avcodec-58.dll rename to third_party/ffmpeg/bin/x64/avcodec-58.dll diff --git a/output/win-x64/debug/avformat-58.dll b/third_party/ffmpeg/bin/x64/avformat-58.dll similarity index 100% rename from output/win-x64/debug/avformat-58.dll rename to third_party/ffmpeg/bin/x64/avformat-58.dll diff --git a/output/win-x64/debug/avutil-56.dll b/third_party/ffmpeg/bin/x64/avutil-56.dll similarity index 100% rename from output/win-x64/debug/avutil-56.dll rename to third_party/ffmpeg/bin/x64/avutil-56.dll diff --git a/output/win-x64/debug/swresample-3.dll b/third_party/ffmpeg/bin/x64/swresample-3.dll similarity index 100% rename from output/win-x64/debug/swresample-3.dll rename to third_party/ffmpeg/bin/x64/swresample-3.dll diff --git a/output/win-x64/debug/swscale-5.dll b/third_party/ffmpeg/bin/x64/swscale-5.dll similarity index 100% rename from output/win-x64/debug/swscale-5.dll rename to third_party/ffmpeg/bin/x64/swscale-5.dll diff --git a/output/win/debug/avcodec-58.dll b/third_party/ffmpeg/bin/x86/avcodec-58.dll similarity index 100% rename from output/win/debug/avcodec-58.dll rename to third_party/ffmpeg/bin/x86/avcodec-58.dll diff --git a/output/win/debug/avformat-58.dll b/third_party/ffmpeg/bin/x86/avformat-58.dll similarity index 100% rename from output/win/debug/avformat-58.dll rename to third_party/ffmpeg/bin/x86/avformat-58.dll diff --git a/output/win/debug/avutil-56.dll b/third_party/ffmpeg/bin/x86/avutil-56.dll similarity index 100% rename from output/win/debug/avutil-56.dll rename to third_party/ffmpeg/bin/x86/avutil-56.dll diff --git a/output/win/debug/swresample-3.dll b/third_party/ffmpeg/bin/x86/swresample-3.dll similarity index 100% rename from output/win/debug/swresample-3.dll rename to third_party/ffmpeg/bin/x86/swresample-3.dll diff --git a/output/win/debug/swscale-5.dll b/third_party/ffmpeg/bin/x86/swscale-5.dll similarity index 100% rename from output/win/debug/swscale-5.dll rename to third_party/ffmpeg/bin/x86/swscale-5.dll diff --git a/third_party/ffmpeg/win64/lib/avcodec.lib b/third_party/ffmpeg/lib/x64/avcodec.lib similarity index 100% rename from third_party/ffmpeg/win64/lib/avcodec.lib rename to third_party/ffmpeg/lib/x64/avcodec.lib diff --git a/third_party/ffmpeg/win64/lib/avformat.lib b/third_party/ffmpeg/lib/x64/avformat.lib similarity index 100% rename from third_party/ffmpeg/win64/lib/avformat.lib rename to third_party/ffmpeg/lib/x64/avformat.lib diff --git a/third_party/ffmpeg/win64/lib/avutil.lib b/third_party/ffmpeg/lib/x64/avutil.lib similarity index 100% rename from third_party/ffmpeg/win64/lib/avutil.lib rename to third_party/ffmpeg/lib/x64/avutil.lib diff --git a/third_party/ffmpeg/win64/lib/swresample.lib b/third_party/ffmpeg/lib/x64/swresample.lib similarity index 100% rename from third_party/ffmpeg/win64/lib/swresample.lib rename to third_party/ffmpeg/lib/x64/swresample.lib diff --git a/third_party/ffmpeg/win64/lib/swscale.lib b/third_party/ffmpeg/lib/x64/swscale.lib similarity index 100% rename from third_party/ffmpeg/win64/lib/swscale.lib rename to third_party/ffmpeg/lib/x64/swscale.lib diff --git a/third_party/ffmpeg/lib/avcodec.lib b/third_party/ffmpeg/lib/x86/avcodec.lib similarity index 100% rename from third_party/ffmpeg/lib/avcodec.lib rename to third_party/ffmpeg/lib/x86/avcodec.lib diff --git a/third_party/ffmpeg/lib/avformat.lib b/third_party/ffmpeg/lib/x86/avformat.lib similarity index 100% rename from third_party/ffmpeg/lib/avformat.lib rename to third_party/ffmpeg/lib/x86/avformat.lib diff --git a/third_party/ffmpeg/lib/avutil.lib b/third_party/ffmpeg/lib/x86/avutil.lib similarity index 100% rename from third_party/ffmpeg/lib/avutil.lib rename to third_party/ffmpeg/lib/x86/avutil.lib diff --git a/third_party/ffmpeg/lib/swresample.lib b/third_party/ffmpeg/lib/x86/swresample.lib similarity index 100% rename from third_party/ffmpeg/lib/swresample.lib rename to third_party/ffmpeg/lib/x86/swresample.lib diff --git a/third_party/ffmpeg/lib/swscale.lib b/third_party/ffmpeg/lib/x86/swscale.lib similarity index 100% rename from third_party/ffmpeg/lib/swscale.lib rename to third_party/ffmpeg/lib/x86/swscale.lib diff --git a/third_party/ffmpeg/win64/bin/avcodec-58.dll b/third_party/ffmpeg/win64/bin/avcodec-58.dll deleted file mode 100644 index 622bcf1..0000000 Binary files a/third_party/ffmpeg/win64/bin/avcodec-58.dll and /dev/null differ diff --git a/third_party/ffmpeg/win64/bin/avformat-58.dll b/third_party/ffmpeg/win64/bin/avformat-58.dll deleted file mode 100644 index 3c06eea..0000000 Binary files a/third_party/ffmpeg/win64/bin/avformat-58.dll and /dev/null differ diff --git a/third_party/ffmpeg/win64/bin/avutil-56.dll b/third_party/ffmpeg/win64/bin/avutil-56.dll deleted file mode 100644 index 7124f61..0000000 Binary files a/third_party/ffmpeg/win64/bin/avutil-56.dll and /dev/null differ diff --git a/third_party/ffmpeg/win64/bin/swresample-3.dll b/third_party/ffmpeg/win64/bin/swresample-3.dll deleted file mode 100644 index 9a9ff3c..0000000 Binary files a/third_party/ffmpeg/win64/bin/swresample-3.dll and /dev/null differ diff --git a/third_party/ffmpeg/win64/bin/swscale-5.dll b/third_party/ffmpeg/win64/bin/swscale-5.dll deleted file mode 100644 index bce9a6e..0000000 Binary files a/third_party/ffmpeg/win64/bin/swscale-5.dll and /dev/null differ