diff --git a/QtScrcpy/CMakeLists.txt b/QtScrcpy/CMakeLists.txt index fae8311..0252e33 100755 --- a/QtScrcpy/CMakeLists.txt +++ b/QtScrcpy/CMakeLists.txt @@ -348,9 +348,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES if(CMAKE_SYSTEM_NAME STREQUAL "Windows") # ffmpeg # include - target_include_directories(${PROJECT_NAME} PRIVATE ../third_party/ffmpeg/include) + target_include_directories(${PROJECT_NAME} PRIVATE ../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include) # link - set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/lib/${QC_CPU_ARCH}") + set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/lib/${QC_CPU_ARCH}") target_link_directories(${PROJECT_NAME} PRIVATE ${FFMPEG_LIB_PATH}) target_link_libraries(${PROJECT_NAME} PRIVATE avformat @@ -359,7 +359,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") swscale ) # copy - set(FFMPEG_BIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/bin/${QC_CPU_ARCH}") + set(FFMPEG_BIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/bin/${QC_CPU_ARCH}") get_target_property(FFMPEG_BIN_OUTPUT_PATH ${PROJECT_NAME} RUNTIME_OUTPUT_DIRECTORY) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_BIN_PATH}/avcodec-58.dll" "${FFMPEG_BIN_OUTPUT_PATH}" @@ -374,9 +374,9 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") # ffmpeg # include - target_include_directories(${PROJECT_NAME} PRIVATE ../third_party/ffmpeg/include) + target_include_directories(${PROJECT_NAME} PRIVATE ../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include) # link - set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/lib") + set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/lib") target_link_directories(${PROJECT_NAME} PRIVATE ${FFMPEG_LIB_PATH}) target_link_libraries(${PROJECT_NAME} PRIVATE avformat.58 @@ -390,14 +390,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(MACOS_BUNDLE_PATH ${MACOS_BUNDLE_PATH}/${PROJECT_NAME}.app/Contents) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD # dylib,scrcpy-server,adb copy to Contents/MacOS - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/lib/libavcodec.58.dylib" "${MACOS_BUNDLE_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/lib/libavformat.58.dylib" "${MACOS_BUNDLE_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/lib/libavutil.56.dylib" "${MACOS_BUNDLE_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/lib/libswscale.5.dylib" "${MACOS_BUNDLE_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/lib/libswresample.3.dylib" "${MACOS_BUNDLE_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/lib/libavcodec.58.dylib" "${MACOS_BUNDLE_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/lib/libavformat.58.dylib" "${MACOS_BUNDLE_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/lib/libavutil.56.dylib" "${MACOS_BUNDLE_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/lib/libswscale.5.dylib" "${MACOS_BUNDLE_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/lib/libswresample.3.dylib" "${MACOS_BUNDLE_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/scrcpy-server" "${MACOS_BUNDLE_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/adb/mac/adb" "${MACOS_BUNDLE_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server" "${MACOS_BUNDLE_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/adb/mac/adb" "${MACOS_BUNDLE_PATH}/MacOS" # config file copy to Contents/MacOS/config COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../config/config.ini" "${MACOS_BUNDLE_PATH}/MacOS/config" ) @@ -430,9 +430,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") find_package(Threads REQUIRED) # include - target_include_directories(${PROJECT_NAME} PRIVATE ../third_party/ffmpeg/include) + target_include_directories(${PROJECT_NAME} PRIVATE ../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include) # link - set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/lib") + set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/lib") target_link_directories(${PROJECT_NAME} PRIVATE ${FFMPEG_LIB_PATH}) target_link_libraries(${PROJECT_NAME} PRIVATE # ffmpeg diff --git a/third_party/ffmpeg/include/libavcodec/ac3_parser.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/ac3_parser.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/ac3_parser.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/ac3_parser.h diff --git a/third_party/ffmpeg/include/libavcodec/adts_parser.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/adts_parser.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/adts_parser.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/adts_parser.h diff --git a/third_party/ffmpeg/include/libavcodec/avcodec.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/avcodec.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/avcodec.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/avcodec.h diff --git a/third_party/ffmpeg/include/libavcodec/avdct.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/avdct.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/avdct.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/avdct.h diff --git a/third_party/ffmpeg/include/libavcodec/avfft.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/avfft.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/avfft.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/avfft.h diff --git a/third_party/ffmpeg/include/libavcodec/d3d11va.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/d3d11va.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/d3d11va.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/d3d11va.h diff --git a/third_party/ffmpeg/include/libavcodec/dirac.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/dirac.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/dirac.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/dirac.h diff --git a/third_party/ffmpeg/include/libavcodec/dv_profile.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/dv_profile.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/dv_profile.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/dv_profile.h diff --git a/third_party/ffmpeg/include/libavcodec/dxva2.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/dxva2.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/dxva2.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/dxva2.h diff --git a/third_party/ffmpeg/include/libavcodec/jni.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/jni.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/jni.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/jni.h diff --git a/third_party/ffmpeg/include/libavcodec/mediacodec.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/mediacodec.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/mediacodec.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/mediacodec.h diff --git a/third_party/ffmpeg/include/libavcodec/qsv.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/qsv.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/qsv.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/qsv.h diff --git a/third_party/ffmpeg/include/libavcodec/vaapi.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/vaapi.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/vaapi.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/vaapi.h diff --git a/third_party/ffmpeg/include/libavcodec/vdpau.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/vdpau.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/vdpau.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/vdpau.h diff --git a/third_party/ffmpeg/include/libavcodec/version.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/version.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/version.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/version.h diff --git a/third_party/ffmpeg/include/libavcodec/videotoolbox.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/videotoolbox.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/videotoolbox.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/videotoolbox.h diff --git a/third_party/ffmpeg/include/libavcodec/vorbis_parser.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/vorbis_parser.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/vorbis_parser.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/vorbis_parser.h diff --git a/third_party/ffmpeg/include/libavcodec/xvmc.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/xvmc.h similarity index 100% rename from third_party/ffmpeg/include/libavcodec/xvmc.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavcodec/xvmc.h diff --git a/third_party/ffmpeg/include/libavformat/avformat.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavformat/avformat.h similarity index 100% rename from third_party/ffmpeg/include/libavformat/avformat.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavformat/avformat.h diff --git a/third_party/ffmpeg/include/libavformat/avio.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavformat/avio.h similarity index 100% rename from third_party/ffmpeg/include/libavformat/avio.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavformat/avio.h diff --git a/third_party/ffmpeg/include/libavformat/version.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavformat/version.h similarity index 100% rename from third_party/ffmpeg/include/libavformat/version.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavformat/version.h diff --git a/third_party/ffmpeg/include/libavutil/adler32.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/adler32.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/adler32.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/adler32.h diff --git a/third_party/ffmpeg/include/libavutil/aes.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/aes.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/aes.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/aes.h diff --git a/third_party/ffmpeg/include/libavutil/aes_ctr.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/aes_ctr.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/aes_ctr.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/aes_ctr.h diff --git a/third_party/ffmpeg/include/libavutil/attributes.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/attributes.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/attributes.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/attributes.h diff --git a/third_party/ffmpeg/include/libavutil/audio_fifo.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/audio_fifo.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/audio_fifo.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/audio_fifo.h diff --git a/third_party/ffmpeg/include/libavutil/avassert.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/avassert.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/avassert.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/avassert.h diff --git a/third_party/ffmpeg/include/libavutil/avconfig.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/avconfig.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/avconfig.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/avconfig.h diff --git a/third_party/ffmpeg/include/libavutil/avstring.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/avstring.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/avstring.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/avstring.h diff --git a/third_party/ffmpeg/include/libavutil/avutil.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/avutil.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/avutil.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/avutil.h diff --git a/third_party/ffmpeg/include/libavutil/base64.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/base64.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/base64.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/base64.h diff --git a/third_party/ffmpeg/include/libavutil/blowfish.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/blowfish.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/blowfish.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/blowfish.h diff --git a/third_party/ffmpeg/include/libavutil/bprint.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/bprint.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/bprint.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/bprint.h diff --git a/third_party/ffmpeg/include/libavutil/bswap.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/bswap.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/bswap.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/bswap.h diff --git a/third_party/ffmpeg/include/libavutil/buffer.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/buffer.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/buffer.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/buffer.h diff --git a/third_party/ffmpeg/include/libavutil/camellia.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/camellia.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/camellia.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/camellia.h diff --git a/third_party/ffmpeg/include/libavutil/cast5.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/cast5.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/cast5.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/cast5.h diff --git a/third_party/ffmpeg/include/libavutil/channel_layout.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/channel_layout.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/channel_layout.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/channel_layout.h diff --git a/third_party/ffmpeg/include/libavutil/common.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/common.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/common.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/common.h diff --git a/third_party/ffmpeg/include/libavutil/cpu.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/cpu.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/cpu.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/cpu.h diff --git a/third_party/ffmpeg/include/libavutil/crc.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/crc.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/crc.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/crc.h diff --git a/third_party/ffmpeg/include/libavutil/des.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/des.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/des.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/des.h diff --git a/third_party/ffmpeg/include/libavutil/dict.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/dict.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/dict.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/dict.h diff --git a/third_party/ffmpeg/include/libavutil/display.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/display.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/display.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/display.h diff --git a/third_party/ffmpeg/include/libavutil/downmix_info.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/downmix_info.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/downmix_info.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/downmix_info.h diff --git a/third_party/ffmpeg/include/libavutil/encryption_info.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/encryption_info.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/encryption_info.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/encryption_info.h diff --git a/third_party/ffmpeg/include/libavutil/error.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/error.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/error.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/error.h diff --git a/third_party/ffmpeg/include/libavutil/eval.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/eval.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/eval.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/eval.h diff --git a/third_party/ffmpeg/include/libavutil/ffversion.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/ffversion.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/ffversion.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/ffversion.h diff --git a/third_party/ffmpeg/include/libavutil/fifo.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/fifo.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/fifo.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/fifo.h diff --git a/third_party/ffmpeg/include/libavutil/file.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/file.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/file.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/file.h diff --git a/third_party/ffmpeg/include/libavutil/frame.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/frame.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/frame.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/frame.h diff --git a/third_party/ffmpeg/include/libavutil/hash.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hash.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hash.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hash.h diff --git a/third_party/ffmpeg/include/libavutil/hdr_dynamic_metadata.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hdr_dynamic_metadata.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hdr_dynamic_metadata.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hdr_dynamic_metadata.h diff --git a/third_party/ffmpeg/include/libavutil/hmac.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hmac.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hmac.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hmac.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_cuda.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_cuda.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_cuda.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_cuda.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_d3d11va.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_d3d11va.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_d3d11va.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_d3d11va.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_drm.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_drm.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_drm.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_drm.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_dxva2.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_dxva2.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_dxva2.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_dxva2.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_mediacodec.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_mediacodec.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_mediacodec.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_mediacodec.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_qsv.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_qsv.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_qsv.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_qsv.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_vaapi.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_vaapi.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_vaapi.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_vaapi.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_vdpau.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_vdpau.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_vdpau.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_vdpau.h diff --git a/third_party/ffmpeg/include/libavutil/hwcontext_videotoolbox.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_videotoolbox.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/hwcontext_videotoolbox.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/hwcontext_videotoolbox.h diff --git a/third_party/ffmpeg/include/libavutil/imgutils.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/imgutils.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/imgutils.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/imgutils.h diff --git a/third_party/ffmpeg/include/libavutil/intfloat.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/intfloat.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/intfloat.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/intfloat.h diff --git a/third_party/ffmpeg/include/libavutil/intreadwrite.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/intreadwrite.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/intreadwrite.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/intreadwrite.h diff --git a/third_party/ffmpeg/include/libavutil/lfg.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/lfg.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/lfg.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/lfg.h diff --git a/third_party/ffmpeg/include/libavutil/log.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/log.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/log.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/log.h diff --git a/third_party/ffmpeg/include/libavutil/lzo.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/lzo.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/lzo.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/lzo.h diff --git a/third_party/ffmpeg/include/libavutil/macros.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/macros.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/macros.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/macros.h diff --git a/third_party/ffmpeg/include/libavutil/mastering_display_metadata.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/mastering_display_metadata.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/mastering_display_metadata.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/mastering_display_metadata.h diff --git a/third_party/ffmpeg/include/libavutil/mathematics.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/mathematics.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/mathematics.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/mathematics.h diff --git a/third_party/ffmpeg/include/libavutil/md5.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/md5.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/md5.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/md5.h diff --git a/third_party/ffmpeg/include/libavutil/mem.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/mem.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/mem.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/mem.h diff --git a/third_party/ffmpeg/include/libavutil/motion_vector.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/motion_vector.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/motion_vector.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/motion_vector.h diff --git a/third_party/ffmpeg/include/libavutil/murmur3.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/murmur3.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/murmur3.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/murmur3.h diff --git a/third_party/ffmpeg/include/libavutil/opt.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/opt.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/opt.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/opt.h diff --git a/third_party/ffmpeg/include/libavutil/parseutils.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/parseutils.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/parseutils.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/parseutils.h diff --git a/third_party/ffmpeg/include/libavutil/pixdesc.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/pixdesc.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/pixdesc.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/pixdesc.h diff --git a/third_party/ffmpeg/include/libavutil/pixelutils.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/pixelutils.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/pixelutils.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/pixelutils.h diff --git a/third_party/ffmpeg/include/libavutil/pixfmt.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/pixfmt.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/pixfmt.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/pixfmt.h diff --git a/third_party/ffmpeg/include/libavutil/random_seed.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/random_seed.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/random_seed.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/random_seed.h diff --git a/third_party/ffmpeg/include/libavutil/rational.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/rational.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/rational.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/rational.h diff --git a/third_party/ffmpeg/include/libavutil/rc4.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/rc4.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/rc4.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/rc4.h diff --git a/third_party/ffmpeg/include/libavutil/replaygain.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/replaygain.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/replaygain.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/replaygain.h diff --git a/third_party/ffmpeg/include/libavutil/ripemd.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/ripemd.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/ripemd.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/ripemd.h diff --git a/third_party/ffmpeg/include/libavutil/samplefmt.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/samplefmt.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/samplefmt.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/samplefmt.h diff --git a/third_party/ffmpeg/include/libavutil/sha.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/sha.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/sha.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/sha.h diff --git a/third_party/ffmpeg/include/libavutil/sha512.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/sha512.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/sha512.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/sha512.h diff --git a/third_party/ffmpeg/include/libavutil/spherical.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/spherical.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/spherical.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/spherical.h diff --git a/third_party/ffmpeg/include/libavutil/stereo3d.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/stereo3d.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/stereo3d.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/stereo3d.h diff --git a/third_party/ffmpeg/include/libavutil/tea.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/tea.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/tea.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/tea.h diff --git a/third_party/ffmpeg/include/libavutil/threadmessage.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/threadmessage.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/threadmessage.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/threadmessage.h diff --git a/third_party/ffmpeg/include/libavutil/time.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/time.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/time.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/time.h diff --git a/third_party/ffmpeg/include/libavutil/timecode.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/timecode.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/timecode.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/timecode.h diff --git a/third_party/ffmpeg/include/libavutil/timestamp.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/timestamp.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/timestamp.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/timestamp.h diff --git a/third_party/ffmpeg/include/libavutil/tree.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/tree.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/tree.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/tree.h diff --git a/third_party/ffmpeg/include/libavutil/twofish.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/twofish.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/twofish.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/twofish.h diff --git a/third_party/ffmpeg/include/libavutil/tx.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/tx.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/tx.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/tx.h diff --git a/third_party/ffmpeg/include/libavutil/version.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/version.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/version.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/version.h diff --git a/third_party/ffmpeg/include/libavutil/xtea.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/xtea.h similarity index 100% rename from third_party/ffmpeg/include/libavutil/xtea.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libavutil/xtea.h diff --git a/third_party/ffmpeg/include/libswresample/swresample.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libswresample/swresample.h similarity index 100% rename from third_party/ffmpeg/include/libswresample/swresample.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libswresample/swresample.h diff --git a/third_party/ffmpeg/include/libswresample/version.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libswresample/version.h similarity index 100% rename from third_party/ffmpeg/include/libswresample/version.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libswresample/version.h diff --git a/third_party/ffmpeg/include/libswscale/swscale.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libswscale/swscale.h similarity index 100% rename from third_party/ffmpeg/include/libswscale/swscale.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libswscale/swscale.h diff --git a/third_party/ffmpeg/include/libswscale/version.h b/QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libswscale/version.h similarity index 100% rename from third_party/ffmpeg/include/libswscale/version.h rename to QtScrcpy/QtScrcpyCore/src/third_party/ffmpeg/include/libswscale/version.h diff --git a/third_party/scrcpy-server b/QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server similarity index 100% rename from third_party/scrcpy-server rename to QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp index b387ca1..06a943d 100644 --- a/QtScrcpy/main.cpp +++ b/QtScrcpy/main.cpp @@ -23,8 +23,8 @@ int main(int argc, char *argv[]) { // set env #ifdef Q_OS_WIN32 - qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/win/adb.exe"); - qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server"); + qputenv("QTSCRCPY_ADB_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/win/adb.exe"); + qputenv("QTSCRCPY_SERVER_PATH", "../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server"); qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap"); qputenv("QTSCRCPY_CONFIG_PATH", "../../../config"); #endif @@ -34,8 +34,8 @@ int main(int argc, char *argv[]) #endif #ifdef Q_OS_LINUX - qputenv("QTSCRCPY_ADB_PATH", "../../third_party/adb/linux/adb"); - qputenv("QTSCRCPY_SERVER_PATH", "../../third_party/scrcpy-server"); + qputenv("QTSCRCPY_ADB_PATH", "../../QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb"); + qputenv("QTSCRCPY_SERVER_PATH", "../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server"); qputenv("QTSCRCPY_CONFIG_PATH", "../../config"); qputenv("QTSCRCPY_KEYMAP_PATH", "../../keymap"); #endif diff --git a/README.md b/README.md index 98713df..8db8bd9 100644 --- a/README.md +++ b/README.md @@ -256,7 +256,7 @@ Qt version>=5.12 (use MSVC 2019 on Windows) 2. Open server project in project root with Android Studio 3. The first time you open it, if you do not have the corresponding version of gradle, you will be prompted to find gradle, whether to upgrade gradle and create it. Select Cancel. After canceling, you will be prompted to select the location of the existing gradle. You can also cancel it (it will download automatically). 4. Edit the code as needed, but of course you do n’t need to. -4. After compiling the apk, rename it to scrcpy-server and replace third_party/scrcpy-server. +4. After compiling the apk, rename it to scrcpy-server and replace QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server. ## Licence Since it is based on scrcpy, respect its Licence diff --git a/ci/win/publish_for_win.bat b/ci/win/publish_for_win.bat index 66fc565..60d56b4 100644 --- a/ci/win/publish_for_win.bat +++ b/ci/win/publish_for_win.bat @@ -40,8 +40,8 @@ echo current build mode: %cpu_mode% echo current publish dir: %publish_dir% :: 环境变量设置 -set adb_path=%script_path%..\..\third_party\adb\win\*.* -set jar_path=%script_path%..\..\third_party\scrcpy-server +set adb_path=%script_path%..\..\QtScrcpy\QtScrcpyCore\src\third_party\adb\win\*.* +set jar_path=%script_path%..\..\QtScrcpy\QtScrcpyCore\src\third_party\scrcpy-server set keymap_path=%script_path%..\..\keymap set config_path=%script_path%..\..\config