Refactoring: Move images to src/res (Windows and Mac)

Jamulus.pro

@@ -78,7 +78,7 @@ DEFINES += QT_NO_DEPRECATED_WARNINGS
 win32 {
     DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible)
     DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5)
-    RC_FILE = windows/mainicon.rc
+    RC_FILE = src/res/win-mainicon.rc
     mingw* {
         LIBS += -lole32 \
             -luser32 \
@@ -159,11 +159,11 @@ win32 {
 
         DEFINES += SERVER_BUNDLE
         TARGET = $${TARGET}Server
-        MACOSX_BUNDLE_ICON.files = mac/jamulus-server-icon-2020.icns
-        RC_FILE = mac/jamulus-server-icon-2020.icns
+        MACOSX_BUNDLE_ICON.files = src/res/mac-jamulus-server.icns
+        RC_FILE = src/res/mac-jamulus-server.icns
     } else {
-        MACOSX_BUNDLE_ICON.files = mac/mainicon.icns
-        RC_FILE = mac/mainicon.icns
+        MACOSX_BUNDLE_ICON.files = src/res/mac-mainicon.icns
+        RC_FILE = src/res/mac-mainicon.icns
     }
 
     HEADERS += src/mac/activity.h src/mac/badgelabel.h

src/res/win-mainicon.rc

@@ -0,0 +1 @@
+IDI_MAINICON            ICON    DISCARDABLE     "win-mainicon.ico"

windows/installer.nsi

@@ -49,17 +49,17 @@ BrandingText "${APP_NAME}. Make music online. With friends. For free."
 !endif
 
 ; Installer graphical element configuration
-!define MUI_ICON                       "${WINDOWS_PATH}\mainicon.ico"
-!define MUI_UNICON                     "${WINDOWS_PATH}\mainicon.ico"
-!define SERVER_ICON                    "${WINDOWS_PATH}\jamulus-server-icon-2020.ico"
+!define MUI_ICON                       "${ROOT_PATH}\src\res\win-mainicon.ico"
+!define MUI_UNICON                     "${ROOT_PATH}\src\res\win-mainicon.ico"
+!define SERVER_ICON                    "${ROOT_PATH}\src\res\win-jamulus-server.ico"
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP         "${WINDOWS_PATH}\installer-banner.bmp"
+!define MUI_HEADERIMAGE_BITMAP         "${ROOT_PATH}\src\res\win-installer-banner.bmp"
 !if ${BUILD_OPTION} == "jackonwindows"
-    !define MUI_WELCOMEFINISHPAGE_BITMAP   "${WINDOWS_PATH}\installer-welcome.bmp"
-    !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${WINDOWS_PATH}\installer-welcome.bmp"
+    !define MUI_WELCOMEFINISHPAGE_BITMAP   "${ROOT_PATH}\src\res\win-installer-welcome.bmp"
+    !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${ROOT_PATH}\src\res\win-installer-welcome.bmp"
 !else
-    !define MUI_WELCOMEFINISHPAGE_BITMAP   "${WINDOWS_PATH}\installer-welcome-asio.bmp"
-    !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${WINDOWS_PATH}\installer-welcome-asio.bmp"
+    !define MUI_WELCOMEFINISHPAGE_BITMAP   "${ROOT_PATH}\src\res\win-installer-welcome-asio.bmp"
+    !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${ROOT_PATH}\src\res\win-installer-welcome-asio.bmp"
 !endif
 
 ; Store the installer language - must be placed before the installer page configuration