diff --git a/Installer/Languages/English.nsh b/Installer/Languages/English.nsh index 839ae26c..caa4dcdf 100644 --- a/Installer/Languages/English.nsh +++ b/Installer/Languages/English.nsh @@ -1,3 +1,7 @@ LangString DESC_main ${LANG_ENGLISH} "Main vocaluxe-files." LangString DESC_bg_videos ${LANG_ENGLISH} "Additional background-videos for ambient-theme." + LangString DESC_directx ${LANG_ENGLISH} "Installs DirectX. This is recommed for vocaluxe." + LangString TITLE_main ${LANG_ENGLISH} "Main" + LangString TITLE_bg_videos ${LANG_ENGLISH} "Background-videos" + LangString TITLE_directx ${LANG_ENGLISH} "DirectX" LangString FINISH_text ${LANG_ENGLISH} "Visit our site for the latest news, FAQ's and support." diff --git a/Installer/Languages/German.nsh b/Installer/Languages/German.nsh index 5f9afc68..6149302f 100644 --- a/Installer/Languages/German.nsh +++ b/Installer/Languages/German.nsh @@ -1,3 +1,7 @@ LangString DESC_main ${LANG_GERMAN} "Vocaluxe-Dateien." LangString DESC_bg_videos ${LANG_GERMAN} "Zusätzliche Hintergrund-Videos für das Ambient-Theme." +LangString DESC_directx ${LANG_GERMAN} "Führt eine DirectX-Installation aus. DirectX wird für Vocaluxe empfohlen." +LangString TITLE_main ${LANG_GERMAN} "Hauptprogramm" +LangString TITLE_bg_videos ${LANG_GERMAN} "Hintergrundvideos" +LangString TITLE_directx ${LANG_GERMAN} "DirectX" LangString FINISH_text ${LANG_GERMAN} "Besuch unsere Homepage für Neuigkeiten, Hilfe und FAQs." diff --git a/Installer/Requirements/dxwebsetup.exe b/Installer/Requirements/dxwebsetup.exe new file mode 100644 index 00000000..c15749ed Binary files /dev/null and b/Installer/Requirements/dxwebsetup.exe differ diff --git a/Installer/installer.nsi b/Installer/installer.nsi index 4263e9a2..75b8e70c 100644 --- a/Installer/installer.nsi +++ b/Installer/installer.nsi @@ -10,13 +10,14 @@ !define PRODUCT_WEBSITE "www.vocaluxe.org" !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" Name "${PRODUCT_NAME} ${PRODUCT_VERSION} ${PRODUCT_STAGE}" - OutFile "Vocaluxe_installer.exe" + OutFile "VocaluxeSetup_${PRODUCT_VERSION}${PRODUCT_STAGE}.exe" InstallDirRegKey HKCU "Software\Vocaluxe" "" RequestExecutionLevel admin Var StartMenuFolder + Var DirectXSetupError !define MUI_ICON "..\Output\Vocaluxe.ico" !define MUI_HEADERIMAGE @@ -83,8 +84,9 @@ ;Installer Sections -Section "Vocaluxe" SecMain +Section $(TITLE_MAIN) SecMain + SectionIn RO SetOutPath "$INSTDIR" File /r "..\Output\BackgroundMusic" @@ -141,14 +143,28 @@ Section "Vocaluxe" SecMain SectionEnd -Section "BG-Videos" SecVideos +Section $(TITLE_bg_videos) SecVideos SetOutPath "$INSTDIR\Themes\Ambient" - ;ADD YOUR OWN FILES HERE... + SetOutPath "$INSTDIR" SectionEnd +Section $(TITLE_directx) SecDirectX + + SetOutPath "$TEMP" + File "Requirements\dxwebsetup.exe" + DetailPrint "Running DirectX Setup..." + ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError + DetailPrint "Finished DirectX Setup" + + Delete "$TEMP\dxwebsetup.exe" + + SetOutPath "$INSTDIR" + +SectionEnd + ;-------------------------------- ;Installer Functions @@ -172,6 +188,7 @@ FunctionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_main) !insertmacro MUI_DESCRIPTION_TEXT ${SecVideos} $(DESC_bg_videos) + !insertmacro MUI_DESCRIPTION_TEXT ${SecDirectX} $(DESC_directx) !insertmacro MUI_FUNCTION_DESCRIPTION_END