mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-08-03 22:28:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: mac build error

Browse source
This commit is contained in:
冉坤 2022-06-14 16:34:56 +08:00
commit fb632ffb25
4 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
QtScrcpy/CMakeLists.txt
View file

@ -268,6 +268,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_custom_command(TARGET ${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/config.ini" COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../config/config.ini" "${MACOS_BUNDLE_PATH}/MacOS/config/config.ini"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/sndcpy/sndcpy.sh" "${MACOS_BUNDLE_PATH}/MacOS"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/sndcpy/sndcpy.apk" "${MACOS_BUNDLE_PATH}/MacOS"
) )
# Step 2. ues MACOSX_PACKAGE_LOCATION copy icns to Resources # Step 2. ues MACOSX_PACKAGE_LOCATION copy icns to Resources
@ -297,6 +299,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
get_target_property(QSC_BIN_OUTPUT_PATH ${PROJECT_NAME} RUNTIME_OUTPUT_DIRECTORY) get_target_property(QSC_BIN_OUTPUT_PATH ${PROJECT_NAME} RUNTIME_OUTPUT_DIRECTORY)
set(QSC_DEPLOY_PATH ${QSC_BIN_OUTPUT_PATH}) set(QSC_DEPLOY_PATH ${QSC_BIN_OUTPUT_PATH})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/sndcpy/sndcpy.sh" "${QSC_BIN_OUTPUT_PATH}"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/sndcpy/sndcpy.apk" "${QSC_BIN_OUTPUT_PATH}"
)
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)

15
QtScrcpy/audio/audiooutput.cpp
View file

@ -2,6 +2,7 @@
#include <QHostAddress> #include <QHostAddress>
#include <QAudioOutput> #include <QAudioOutput>
#include <QTime> #include <QTime>
#include <QElapsedTimer>
#include "audiooutput.h" #include "audiooutput.h"
@ -67,10 +68,18 @@ bool AudioOutput::runSndcpyProcess(const QString &serial, int port)
m_sndcpy.kill(); m_sndcpy.kill();
} }
#ifdef Q_OS_WIN32
QStringList params; QStringList params;
params << serial; params << serial;
params << QString("%1").arg(port); params << QString("%1").arg(port);
m_sndcpy.start("sndcpy.bat", params); m_sndcpy.start("sndcpy.bat", params);
#else
QStringList params;
params << "sndcpy.sh";
params << serial;
params << QString("%1").arg(port);
m_sndcpy.start("bash", params);
#endif
/* /*
if (!m_sndcpy.waitForStarted()) { if (!m_sndcpy.waitForStarted()) {
qWarning() << "AudioOutput::start sndcpy.bat failed"; qWarning() << "AudioOutput::start sndcpy.bat failed";
@ -159,9 +168,15 @@ void AudioOutput::startRecvData(int port)
qInfo() << "AudioOutput::audio socket state changed:" << state; qInfo() << "AudioOutput::audio socket state changed:" << state;
}); });
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(audioSocket, &QTcpSocket::errorOccurred, audioSocket, [](QAbstractSocket::SocketError error) { connect(audioSocket, &QTcpSocket::errorOccurred, audioSocket, [](QAbstractSocket::SocketError error) {
qInfo() << "AudioOutput::audio socket error occurred:" << error; qInfo() << "AudioOutput::audio socket error occurred:" << error;
}); });
#else
connect(audioSocket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), audioSocket, [](QAbstractSocket::SocketError error) {
qInfo() << "AudioOutput::audio socket error occurred:" << error;
});
#endif
m_workerThread.start(); m_workerThread.start();
emit connectTo(port); emit connectTo(port);

5
QtScrcpy/main.cpp
View file

@ -29,7 +29,10 @@ int main(int argc, char *argv[])
#endif #endif
#ifdef Q_OS_OSX #ifdef Q_OS_OSX
qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../../keymap"); qputenv("QTSCRCPY_ADB_PATH", "../../../../../../QtScrcpy/QtScrcpyCore/src/third_party/adb/mac/adb");
qputenv("QTSCRCPY_SERVER_PATH", "../../../../../../QtScrcpy/QtScrcpyCore/src/third_party/scrcpy-server");
qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../../../keymap");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../../../../config");
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX

1
QtScrcpy/sndcpy/sndcpy.sh Executable file
View file

@ -0,0 +1 @@
echo aaaa