Merge branch 'windows-nsis-fix'
This commit is contained in:
commit
fb7de2ad1d
1 changed files with 8 additions and 8 deletions
|
@ -1,7 +1,7 @@
|
||||||
!include "MUI2.nsh"
|
!include "MUI2.nsh"
|
||||||
!include "FileFunc.nsh"
|
!include "FileFunc.nsh"
|
||||||
|
|
||||||
!define /date TIMESTAMP "%Y%m%d"
|
!define /date TIMESTAMP "%Y%m%d"
|
||||||
!searchparse /file ../build/cockatrice/version_string.cpp '= "' VERSION '";'
|
!searchparse /file ../build/cockatrice/version_string.cpp '= "' VERSION '";'
|
||||||
|
|
||||||
Name "Cockatrice"
|
Name "Cockatrice"
|
||||||
|
@ -52,7 +52,7 @@ Section "Application" SecApplication
|
||||||
|
|
||||||
SetOutPath "$INSTDIR\zonebg"
|
SetOutPath "$INSTDIR\zonebg"
|
||||||
File /r ..\zonebg\*.*
|
File /r ..\zonebg\*.*
|
||||||
|
|
||||||
SetOutPath "$INSTDIR\plugins"
|
SetOutPath "$INSTDIR\plugins"
|
||||||
SetOutPath "$INSTDIR\plugins\codecs"
|
SetOutPath "$INSTDIR\plugins\codecs"
|
||||||
File "${QTDIR}\plugins\codecs\qcncodecs4.dll"
|
File "${QTDIR}\plugins\codecs\qcncodecs4.dll"
|
||||||
|
@ -67,7 +67,7 @@ Section "Application" SecApplication
|
||||||
|
|
||||||
SetOutPath "$INSTDIR\sounds"
|
SetOutPath "$INSTDIR\sounds"
|
||||||
File /r ..\sounds\*.*
|
File /r ..\sounds\*.*
|
||||||
|
|
||||||
SetOutPath "$INSTDIR\translations"
|
SetOutPath "$INSTDIR\translations"
|
||||||
File /r ..\build\cockatrice\*.qm
|
File /r ..\build\cockatrice\*.qm
|
||||||
|
|
||||||
|
@ -83,10 +83,10 @@ Section "Application" SecApplication
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section "Update configuration" SecUpdateConfig
|
Section "Update configuration" SecUpdateConfig
|
||||||
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$INSTDIR\cards.xml"
|
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$APPDATA\Cockatrice\cards.xml"
|
||||||
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$INSTDIR\decks"
|
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$APPDATA\Cockatrice\decks"
|
||||||
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$INSTDIR\pics"
|
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$APPDATA\Cockatrice\pics"
|
||||||
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\sound" "path" "$INSTDIR\sounds"
|
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\sound" "path" "$APPDATA\Cockatrice\sounds"
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section "Start menu item" SecStartMenu
|
Section "Start menu item" SecStartMenu
|
||||||
|
@ -115,7 +115,7 @@ SetShellVarContext all
|
||||||
Delete "$INSTDIR\QtMultimedia4.dll"
|
Delete "$INSTDIR\QtMultimedia4.dll"
|
||||||
RMDir "$INSTDIR"
|
RMDir "$INSTDIR"
|
||||||
|
|
||||||
RMDir /r "$SMPROGRAMS\Cockatrice"
|
RMDir "$SMPROGRAMS\Cockatrice"
|
||||||
|
|
||||||
DeleteRegKey HKCU "Software\Cockatrice"
|
DeleteRegKey HKCU "Software\Cockatrice"
|
||||||
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice"
|
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice"
|
||||||
|
|
Loading…
Reference in a new issue