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/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%