xingzi
/
QtScrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: mac build error

Browse Source
dev
冉坤 4 years ago
parent 15bff4f250
commit 249041c3b2
5 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File

6
QtScrcpy/CMakeLists.txt
Unescape View File

@ -246,13 +246,13 @@ endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
# copy bundle file # copy bundle file
get_target_property(MACOS_BUNDLE_PATH ${PROJECT_NAME} RUNTIME_OUTPUT_DIRECTORY) get_target_property(MACOS_BUNDLE_PATH ${PROJECT_NAME} RUNTIME_OUTPUT_DIRECTORY)
set(MACOS_BUNDLE_PATH ${MACOS_BUNDLE_PATH}/${QSC_PROJECT_NAME}.app/Contents) set(MACOS_BUNDLE_PATH ${MACOS_BUNDLE_PATH}/${PROJECT_NAME}.app/Contents)
set(QSC_DEPLOY_PATH ${MACOS_BUNDLE_PATH}) set(QSC_DEPLOY_PATH ${MACOS_BUNDLE_PATH})
add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
# config file copy to Contents/MacOS/config # 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" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../config/config.ini" "${MACOS_BUNDLE_PATH}/MacOS/config/config.ini"
) )
# Step 2. ues MACOSX_PACKAGE_LOCATION copy icns to Resources # Step 2. ues MACOSX_PACKAGE_LOCATION copy icns to Resources

18
QtScrcpy/QtScrcpyCore/CMakeLists.txt
Unescape View File

@ -181,14 +181,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
# copy bundle file # copy bundle file
add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD
# dylib,scrcpy-server,adb copy to Contents/MacOS # dylib,scrcpy-server,adb copy to Contents/MacOS
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavcodec.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavcodec.58.dylib" "${QSC_DEPLOY_PATH}/MacOS"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavformat.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavformat.58.dylib" "${QSC_DEPLOY_PATH}/MacOS"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavutil.56.dylib" "${QSC_DEPLOY_PATH}/MacOS" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavutil.56.dylib" "${QSC_DEPLOY_PATH}/MacOS"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswscale.5.dylib" "${QSC_DEPLOY_PATH}/MacOS" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswscale.5.dylib" "${QSC_DEPLOY_PATH}/MacOS"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswresample.3.dylib" "${QSC_DEPLOY_PATH}/MacOS" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswresample.3.dylib" "${QSC_DEPLOY_PATH}/MacOS"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/scrcpy-server" "${QSC_DEPLOY_PATH}/MacOS" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/scrcpy-server" "${QSC_DEPLOY_PATH}/MacOS"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/adb/mac/adb" "${QSC_DEPLOY_PATH}/MacOS" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/adb/mac/adb" "${QSC_DEPLOY_PATH}/MacOS"
) )
endif() endif()
@ -200,7 +200,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
# include # include
target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/include) target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/include)
# link # link
set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib") set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib")
target_link_directories(${QSC_PROJECT_NAME} PUBLIC ${FFMPEG_LIB_PATH}) target_link_directories(${QSC_PROJECT_NAME} PUBLIC ${FFMPEG_LIB_PATH})
target_link_libraries(${QSC_PROJECT_NAME} PRIVATE target_link_libraries(${QSC_PROJECT_NAME} PRIVATE
# ffmpeg # ffmpeg

2
QtScrcpy/QtScrcpyCore/src/device/device.h
Unescape View File

@ -87,7 +87,7 @@ private:
QPointer<Controller> m_controller; QPointer<Controller> m_controller;
QPointer<FileHandler> m_fileHandler; QPointer<FileHandler> m_fileHandler;
QPointer<Stream> m_stream; QPointer<Stream> m_stream;
QPointer<Recorder> m_recorder = Q_NULLPTR; QPointer<Recorder> m_recorder;
QElapsedTimer m_startTimeCount; QElapsedTimer m_startTimeCount;
DeviceParams m_params; DeviceParams m_params;

4
QtScrcpy/ui/dialog.cpp
Unescape View File

@ -658,9 +658,7 @@ void Dialog::on_useSingleModeCheck_clicked()
ui->rightWidget->show(); ui->rightWidget->show();
} }
QTimer::singleShot(0, this, [this]() { resize(layout()->sizeHint().width(), height());
resize(layout()->sizeHint().width(), height());
});
} }
void Dialog::on_serialBox_currentIndexChanged(const QString &arg1) void Dialog::on_serialBox_currentIndexChanged(const QString &arg1)

7
all.pro
Unescape View File

@ -1,7 +0,0 @@
TEMPLATE = subdirs
SUBDIRS = QtScrcpy
# 多语言翻译文件
TRANSLATIONS = \
$$PWD/QtScrcpy/res/i18n/zh_CN.ts \
$$PWD/QtScrcpy/res/i18n/en_US.ts
Write Preview
Loading…
Cancel
Save