Skip to content

Commit

Permalink
Fix DX7 VB component install
Browse files Browse the repository at this point in the history
  • Loading branch information
muratiakos committed Jun 26, 2023
1 parent 83a95f8 commit c638f55
Showing 1 changed file with 17 additions and 24 deletions.
41 changes: 17 additions & 24 deletions setup/hsz.NSI
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
;!define MUI_PRODUCT "Hangos számológép"
;!define MUI_VERSION ""

!include "MUI.nsh"

;--------------------------------
Expand All @@ -11,20 +8,18 @@
ShowInstDetails show

InstallDir "$PROGRAMFILES\Hangos_Szamologep"

InstallDirRegKey HKCU "Software\Hangos_Szamologep" ""

;--------------------------------
;Modern UI Configuration

;!define USE_SUBSECTION
;!define MUI_LICENSEPAGE
!define MUI_COMPONENTSPAGE
!define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_DIRECTORYPAGE

!define MUI_ABORTWARNING

!define MUI_UNINSTALLER
!define MUI_UNCONFIRMPAGE

Expand All @@ -33,15 +28,15 @@
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES

!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES

;--------------------------------
;Languages

!insertmacro MUI_LANGUAGE "Hungarian"

;--------------------------------
;Language Strings

Expand All @@ -53,15 +48,15 @@

;--------------------------------
;Data

;LicenseData "license.rtf"

;--------------------------------
;Reserve Files

;Things that need to be extracted on first (keep these lines before any File command!)
;Only useful for BZIP2 compression

;ReserveFile "${NSISDIR}\Contrib\Icons\modern-header.bmp"

;--------------------------------
Expand All @@ -73,7 +68,7 @@ Section "Hangos sz
detailprint ">>> Hangos számológép telepítése..."
;CreateDirectory "$INSTDIR"
SetOutPath "$INSTDIR"
File "hang_szam.exe"
File "..\hang_szam.exe"
;CopyFiles "$EXEDIR\hang_szam.exe" "$INSTDIR\" 64
CreateDirectory "$SMPROGRAMS\Hangos számológép"
CreateShortCut "$SMPROGRAMS\Hangos számológép\Hangos számológép.lnk" "$INSTDIR\hang_szam.exe"
Expand All @@ -83,7 +78,6 @@ Section "Hangos sz
CreateDirectory "$INSTDIR\hangok"
SetOutPath "$INSTDIR\hangok"
file "..\hangok\*.*"
;CopyFiles "$EXEDIR\hangok\*.*" "$INSTDIR\hangok" 2460
detailprint ""
SectionEnd

Expand All @@ -100,18 +94,19 @@ section "DirectX 7" dx7
SetOutPath "$INSTDIR"
file "dx70eng.exe"
execwait "$INSTDIR\dx70eng.exe /q"

SetOutPath "$SYSDIR"
file "dx7vb.dll"
execwait "regsvr32.exe /i /s $SYSDIR/dx7vb.dll"
detailprint ""
sectionend

Section "Eltávolító alkalmazás" Eltavolit
detailprint ">>> Eltávoító alkalmazás telepítése..."
SetOutPath "$INSTDIR"
WriteUninstaller "$INSTDIR\eltavolit.exe"
CreateShortCut "$SMPROGRAMS\Hangos számológép\Eltávolítás.lnk" "$INSTDIR\eltavolit.exe"
Sectionend


;!insertmacro MUI_SECTIONS_FINISHHEADER
CreateShortCut "$SMPROGRAMS\Hangos számológép\Eltávolítás.lnk" "$INSTDIR\eltavolit.exe"
Sectionend


!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
Expand All @@ -120,7 +115,7 @@ Sectionend
!insertmacro MUI_DESCRIPTION_TEXT ${dx7} $(DESC_dx7)
!insertmacro MUI_DESCRIPTION_TEXT ${Eltavolit} $(DESC_Eltavolit)
!insertmacro MUI_FUNCTION_DESCRIPTION_END

;--------------------------------
;Uninstaller Section

Expand All @@ -131,6 +126,4 @@ Section "Uninstall"
rmdir "$SMPROGRAMS\Hangos számológép"
rmdir "$INSTDIR\hangok"
rmdir "$INSTDIR"

;!insertmacro MUI_UNFINISHHEADER
SectionEnd

0 comments on commit c638f55

Please sign in to comment.