1. Some improvement.
2. Added DirectX-Installer. (Needs to be online)
This commit is contained in:
1 parent
776948205c
commit
a05e6ebc16
4 files changed
+29
-4
No files matched your search
@@ -1,3 +1,7 @@
|
|||||||
LangString DESC_main ${LANG_ENGLISH} "Main vocaluxe-files."
|
LangString DESC_main ${LANG_ENGLISH} "Main vocaluxe-files."
|
||||||
LangString DESC_bg_videos ${LANG_ENGLISH} "Additional background-videos for ambient-theme."
|
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."
|
LangString FINISH_text ${LANG_ENGLISH} "Visit our site for the latest news, FAQ's and support."
|
||||||
@@ -1,3 +1,7 @@
|
|||||||
LangString DESC_main ${LANG_GERMAN} "Vocaluxe-Dateien."
|
LangString DESC_main ${LANG_GERMAN} "Vocaluxe-Dateien."
|
||||||
LangString DESC_bg_videos ${LANG_GERMAN} "Zusätzliche Hintergrund-Videos für das Ambient-Theme."
|
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."
|
LangString FINISH_text ${LANG_GERMAN} "Besuch unsere Homepage für Neuigkeiten, Hilfe und FAQs."
|
||||||
Binary file not shown.
+21
-4
@@ -10,13 +10,14 @@
|
|||||||
!define PRODUCT_WEBSITE "www.vocaluxe.org"
|
!define PRODUCT_WEBSITE "www.vocaluxe.org"
|
||||||
!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
|
!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
|
||||||
Name "${PRODUCT_NAME} ${PRODUCT_VERSION} ${PRODUCT_STAGE}"
|
Name "${PRODUCT_NAME} ${PRODUCT_VERSION} ${PRODUCT_STAGE}"
|
||||||
OutFile "Vocaluxe_installer.exe"
|
OutFile "VocaluxeSetup_${PRODUCT_VERSION}${PRODUCT_STAGE}.exe"
|
||||||
|
|
||||||
InstallDirRegKey HKCU "Software\Vocaluxe" ""
|
InstallDirRegKey HKCU "Software\Vocaluxe" ""
|
||||||
|
|
||||||
RequestExecutionLevel admin
|
RequestExecutionLevel admin
|
||||||
|
|
||||||
Var StartMenuFolder
|
Var StartMenuFolder
|
||||||
|
Var DirectXSetupError
|
||||||
|
|
||||||
!define MUI_ICON "..\Output\Vocaluxe.ico"
|
!define MUI_ICON "..\Output\Vocaluxe.ico"
|
||||||
!define MUI_HEADERIMAGE
|
!define MUI_HEADERIMAGE
|
||||||
@@ -83,8 +84,9 @@
|
|||||||
|
|
||||||
;Installer Sections
|
;Installer Sections
|
||||||
|
|
||||||
Section "Vocaluxe" SecMain
|
Section $(TITLE_MAIN) SecMain
|
||||||
|
|
||||||
|
SectionIn RO
|
||||||
SetOutPath "$INSTDIR"
|
SetOutPath "$INSTDIR"
|
||||||
|
|
||||||
File /r "..\Output\BackgroundMusic"
|
File /r "..\Output\BackgroundMusic"
|
||||||
@@ -141,14 +143,28 @@ Section "Vocaluxe" SecMain
|
|||||||
|
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section "BG-Videos" SecVideos
|
Section $(TITLE_bg_videos) SecVideos
|
||||||
|
|
||||||
SetOutPath "$INSTDIR\Themes\Ambient"
|
SetOutPath "$INSTDIR\Themes\Ambient"
|
||||||
|
|
||||||
;ADD YOUR OWN FILES HERE...
|
SetOutPath "$INSTDIR"
|
||||||
|
|
||||||
SectionEnd
|
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
|
;Installer Functions
|
||||||
|
|
||||||
@@ -172,6 +188,7 @@ FunctionEnd
|
|||||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_main)
|
!insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_main)
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecVideos} $(DESC_bg_videos)
|
!insertmacro MUI_DESCRIPTION_TEXT ${SecVideos} $(DESC_bg_videos)
|
||||||
|
!insertmacro MUI_DESCRIPTION_TEXT ${SecDirectX} $(DESC_directx)
|
||||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user