diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro index 17d980b..99eef42 100644 --- a/QtScrcpy/QtScrcpy.pro +++ b/QtScrcpy/QtScrcpy.pro @@ -22,7 +22,10 @@ DEFINES += QT_DEPRECATED_WARNINGS # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - +msvc{ + QMAKE_CFLAGS += -source-charset:utf-8 + QMAKE_CXXFLAGS += -source-charset:utf-8 +} # 源码 SOURCES += \ main.cpp \ @@ -58,24 +61,40 @@ INCLUDEPATH += \ # Win平台下配置 # *********************************************************** win32 { - # 输出目录 - CONFIG(debug, debug|release) { - DESTDIR = $$PWD/../output/win/debug + contains(QMAKE_TARGET.arch, x86_64) { + message("x64") + # 输出目录 + CONFIG(debug, debug|release) { + DESTDIR = $$PWD/../output/win-x64/debug + } else { + 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 } else { - DESTDIR = $$PWD/../output/win/release + message("x86") + # 输出目录 + CONFIG(debug, debug|release) { + DESTDIR = $$PWD/../output/win/debug + } else { + DESTDIR = $$PWD/../output/win/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 } - - # 依赖模块 - 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 - # windows rc file RC_FILE = $$PWD/res/QtScrcpy.rc } - # *********************************************************** # Mac平台下配置 # *********************************************************** diff --git a/backup/ffmpeg-4.1.3-win64-dev.zip b/backup/ffmpeg-4.1.3-win64-dev.zip new file mode 100644 index 0000000..75e2048 Binary files /dev/null and b/backup/ffmpeg-4.1.3-win64-dev.zip differ diff --git a/backup/ffmpeg-4.1.3-win64-shared.zip b/backup/ffmpeg-4.1.3-win64-shared.zip new file mode 100644 index 0000000..1e421c3 Binary files /dev/null and b/backup/ffmpeg-4.1.3-win64-shared.zip differ diff --git a/output/win-x64/debug/avcodec-58.dll b/output/win-x64/debug/avcodec-58.dll new file mode 100644 index 0000000..622bcf1 Binary files /dev/null and b/output/win-x64/debug/avcodec-58.dll differ diff --git a/output/win-x64/debug/avformat-58.dll b/output/win-x64/debug/avformat-58.dll new file mode 100644 index 0000000..3c06eea Binary files /dev/null and b/output/win-x64/debug/avformat-58.dll differ diff --git a/output/win-x64/debug/avutil-56.dll b/output/win-x64/debug/avutil-56.dll new file mode 100644 index 0000000..7124f61 Binary files /dev/null and b/output/win-x64/debug/avutil-56.dll differ diff --git a/output/win-x64/debug/swresample-3.dll b/output/win-x64/debug/swresample-3.dll new file mode 100644 index 0000000..9a9ff3c Binary files /dev/null and b/output/win-x64/debug/swresample-3.dll differ diff --git a/output/win-x64/debug/swscale-5.dll b/output/win-x64/debug/swscale-5.dll new file mode 100644 index 0000000..bce9a6e Binary files /dev/null and b/output/win-x64/debug/swscale-5.dll differ diff --git a/output/win-x64/release/avcodec-58.dll b/output/win-x64/release/avcodec-58.dll new file mode 100644 index 0000000..622bcf1 Binary files /dev/null and b/output/win-x64/release/avcodec-58.dll differ diff --git a/output/win-x64/release/avformat-58.dll b/output/win-x64/release/avformat-58.dll new file mode 100644 index 0000000..3c06eea Binary files /dev/null and b/output/win-x64/release/avformat-58.dll differ diff --git a/output/win-x64/release/avutil-56.dll b/output/win-x64/release/avutil-56.dll new file mode 100644 index 0000000..7124f61 Binary files /dev/null and b/output/win-x64/release/avutil-56.dll differ diff --git a/output/win-x64/release/swresample-3.dll b/output/win-x64/release/swresample-3.dll new file mode 100644 index 0000000..9a9ff3c Binary files /dev/null and b/output/win-x64/release/swresample-3.dll differ diff --git a/output/win-x64/release/swscale-5.dll b/output/win-x64/release/swscale-5.dll new file mode 100644 index 0000000..bce9a6e Binary files /dev/null and b/output/win-x64/release/swscale-5.dll differ diff --git a/output/win/debug/avcodec-58.dll b/output/win/debug/avcodec-58.dll index 546a2af..1a31e6a 100644 Binary files a/output/win/debug/avcodec-58.dll and b/output/win/debug/avcodec-58.dll differ diff --git a/output/win/debug/avformat-58.dll b/output/win/debug/avformat-58.dll index 8509d19..e9d0c5b 100644 Binary files a/output/win/debug/avformat-58.dll and b/output/win/debug/avformat-58.dll differ diff --git a/output/win/debug/avutil-56.dll b/output/win/debug/avutil-56.dll index 5a8d7da..3f2be25 100644 Binary files a/output/win/debug/avutil-56.dll and b/output/win/debug/avutil-56.dll differ diff --git a/output/win/debug/swresample-3.dll b/output/win/debug/swresample-3.dll index b02035e..8428f66 100644 Binary files a/output/win/debug/swresample-3.dll and b/output/win/debug/swresample-3.dll differ diff --git a/output/win/debug/swscale-5.dll b/output/win/debug/swscale-5.dll index 9b12190..853dda4 100644 Binary files a/output/win/debug/swscale-5.dll and b/output/win/debug/swscale-5.dll differ diff --git a/output/win/release/avcodec-58.dll b/output/win/release/avcodec-58.dll index 546a2af..1a31e6a 100644 Binary files a/output/win/release/avcodec-58.dll and b/output/win/release/avcodec-58.dll differ diff --git a/output/win/release/avformat-58.dll b/output/win/release/avformat-58.dll index 8509d19..e9d0c5b 100644 Binary files a/output/win/release/avformat-58.dll and b/output/win/release/avformat-58.dll differ diff --git a/output/win/release/avutil-56.dll b/output/win/release/avutil-56.dll index 5a8d7da..3f2be25 100644 Binary files a/output/win/release/avutil-56.dll and b/output/win/release/avutil-56.dll differ diff --git a/output/win/release/swresample-3.dll b/output/win/release/swresample-3.dll index b02035e..8428f66 100644 Binary files a/output/win/release/swresample-3.dll and b/output/win/release/swresample-3.dll differ diff --git a/output/win/release/swscale-5.dll b/output/win/release/swscale-5.dll index 9b12190..853dda4 100644 Binary files a/output/win/release/swscale-5.dll and b/output/win/release/swscale-5.dll differ diff --git a/third_party/ffmpeg/win64/bin/avcodec-58.dll b/third_party/ffmpeg/win64/bin/avcodec-58.dll new file mode 100644 index 0000000..622bcf1 Binary files /dev/null and b/third_party/ffmpeg/win64/bin/avcodec-58.dll differ diff --git a/third_party/ffmpeg/win64/bin/avformat-58.dll b/third_party/ffmpeg/win64/bin/avformat-58.dll new file mode 100644 index 0000000..3c06eea Binary files /dev/null and b/third_party/ffmpeg/win64/bin/avformat-58.dll differ diff --git a/third_party/ffmpeg/win64/bin/avutil-56.dll b/third_party/ffmpeg/win64/bin/avutil-56.dll new file mode 100644 index 0000000..7124f61 Binary files /dev/null and b/third_party/ffmpeg/win64/bin/avutil-56.dll differ diff --git a/third_party/ffmpeg/win64/bin/swresample-3.dll b/third_party/ffmpeg/win64/bin/swresample-3.dll new file mode 100644 index 0000000..9a9ff3c Binary files /dev/null and b/third_party/ffmpeg/win64/bin/swresample-3.dll differ diff --git a/third_party/ffmpeg/win64/bin/swscale-5.dll b/third_party/ffmpeg/win64/bin/swscale-5.dll new file mode 100644 index 0000000..bce9a6e Binary files /dev/null and b/third_party/ffmpeg/win64/bin/swscale-5.dll differ diff --git a/third_party/ffmpeg/win64/lib/avcodec.lib b/third_party/ffmpeg/win64/lib/avcodec.lib new file mode 100644 index 0000000..c920e61 Binary files /dev/null and b/third_party/ffmpeg/win64/lib/avcodec.lib differ diff --git a/third_party/ffmpeg/win64/lib/avformat.lib b/third_party/ffmpeg/win64/lib/avformat.lib new file mode 100644 index 0000000..694f774 Binary files /dev/null and b/third_party/ffmpeg/win64/lib/avformat.lib differ diff --git a/third_party/ffmpeg/win64/lib/avutil.lib b/third_party/ffmpeg/win64/lib/avutil.lib new file mode 100644 index 0000000..6f4af85 Binary files /dev/null and b/third_party/ffmpeg/win64/lib/avutil.lib differ diff --git a/third_party/ffmpeg/win64/lib/swresample.lib b/third_party/ffmpeg/win64/lib/swresample.lib new file mode 100644 index 0000000..4e88d5e Binary files /dev/null and b/third_party/ffmpeg/win64/lib/swresample.lib differ diff --git a/third_party/ffmpeg/win64/lib/swscale.lib b/third_party/ffmpeg/win64/lib/swscale.lib new file mode 100644 index 0000000..ca24049 Binary files /dev/null and b/third_party/ffmpeg/win64/lib/swscale.lib differ