diff --git a/mea.pro b/mea.pro index 79d5b92f..4a26016b 100644 --- a/mea.pro +++ b/mea.pro @@ -15,7 +15,12 @@ wininstaller.depends = mea wininstaller.commands += rmdir /S /Q mea\release\out && mkdir mea\release\out && wininstaller.commands += copy mea\release\mea.exe mea\release\out\ && wininstaller.commands += windeployqt --qmldir mea\ui mea\release\out && -wininstaller.commands += makensis packaging\windows\win-installer.nsi +BR=$$BRANDING +equals(BR, "") { + wininstaller.commands += makensis /DBRANDING=guh packaging\windows\win-installer.nsi +} else { + wininstaller.commands += makensis /DBRANDING=BR packaging\windows\win-installer.nsi +} QMAKE_EXTRA_TARGETS += wininstaller target.depends += wininstaller diff --git a/mea/guh-logo.ico b/packaging/windows/guh-logo.ico similarity index 100% rename from mea/guh-logo.ico rename to packaging/windows/guh-logo.ico diff --git a/packaging/windows/maveo-logo.ico b/packaging/windows/maveo-logo.ico new file mode 100644 index 00000000..0d839968 Binary files /dev/null and b/packaging/windows/maveo-logo.ico differ diff --git a/packaging/windows/win-installer.nsi b/packaging/windows/win-installer.nsi index 2ee0b6f1..a3716382 100644 --- a/packaging/windows/win-installer.nsi +++ b/packaging/windows/win-installer.nsi @@ -30,8 +30,8 @@ InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}" LicenseData "LICENSE" # This will be in the installer/uninstaller's title bar Name "${COMPANYNAME} - ${APPNAME}" -Icon "mea\guh-logo.ico" -outFile "mea-installer.exe" +Icon "${BRANDING}-logo.ico" +outFile "..\..\mea-${BRANDING}-installer.exe" !include LogicLib.nsh @@ -59,15 +59,15 @@ section "install" # Files for the install directory - to build the installer, these should be in the same directory as the install script (this file) setOutPath $INSTDIR - file "guh-logo.ico" - file /r "mea\release\out\*" + file "${BRANDING}-logo.ico" + file /r "..\..\mea\release\out\*" # Uninstaller - See function un.onInit and section "uninstall" for configuration writeUninstaller "$INSTDIR\uninstall.exe" # Start Menu createDirectory "$SMPROGRAMS\${COMPANYNAME}" - createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\mea.exe" "" "$INSTDIR\guh-logo.ico" + createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\mea.exe" "" "$INSTDIR\${BRANDING}-logo.ico" # Registry information for add/remove programs WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${COMPANYNAME} - ${APPNAME} - ${DESCRIPTION}"