🐛 fix windows build

liangshao666 · Apr 8, 2024 · ff99e20 · ff99e20
1 parent b6d15bb
commit ff99e20
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git 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
@@ -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})