From ff99e202db01fe9baee7456c5d4626afefbde5e8 Mon Sep 17 00:00:00 2001 From: Reverier-Xu Date: Mon, 8 Apr 2024 22:34:04 +0800 Subject: [PATCH] :bug: fix windows build --- deploy_windows.sh | 17 +++++++---------- desktop/CMakeLists.txt | 6 ++++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/deploy_windows.sh b/deploy_windows.sh index eafde7a..28b1f41 100755 --- a/deploy_windows.sh +++ b/deploy_windows.sh @@ -44,16 +44,13 @@ done ## APP INSTALL ################################################################# -if [[ $make_install = true ]] ; then - echo '---- Running make install' - mkdir -p dist - APP_ROOT=dist - cp ./build/bin/wsrx.exe "${APP_ROOT}/wsrx.exe" - cp ./build/bin/wsrx-desktop.exe "${APP_ROOT}/wsrx-desktop.exe" - - #echo '---- Installation directory content recap (after make install):' - #find bin/ -fi +echo '---- Running make install' +mkdir -p dist +APP_ROOT=dist +cp ./build/bin/wsrx.exe "${APP_ROOT}/wsrx.exe" +cp ./build/bin/wsrx-desktop.exe "${APP_ROOT}/wsrx-desktop.exe" +#echo '---- Installation directory content recap (after make install):' +#find bin/ ## DEPLOY ###################################################################### diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt index d16c91e..0165b2c 100644 --- a/desktop/CMakeLists.txt +++ b/desktop/CMakeLists.txt @@ -26,7 +26,13 @@ set( qt_add_big_resources(RESOURCES resources/i18n.qrc resources/resources.qrc) +if(WIN32) +add_executable(${PROJECT_NAME}-desktop WIN32 ${SOURCES} ${RESOURCES}) +elseif(APPLE) +add_executable(${PROJECT_NAME}-desktop MACOSX_BUNDLE ${SOURCES} ${RESOURCES}) +else() add_executable(${PROJECT_NAME}-desktop ${SOURCES} ${RESOURCES}) +endif() target_link_libraries(${PROJECT_NAME}-desktop ${QT_LIBRARIES})