Skip to content

Commit

Permalink
Windows installer graphics and move to 64bit only
Browse files Browse the repository at this point in the history
  • Loading branch information
Bushstar committed Nov 12, 2020
1 parent 8340e91 commit d938a1d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
Binary file modified share/pixmaps/bitcoin.ico
Binary file not shown.
Binary file modified share/pixmaps/nsis-header.bmp
Binary file not shown.
Binary file modified share/pixmaps/nsis-wizard.bmp
Binary file not shown.
14 changes: 3 additions & 11 deletions src/omnicore/res/omnicore-setup-win.nsi.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Name "@PACKAGE_NAME@ (@WINDOWS_BITS@-bit)"
Name "@PACKAGE_NAME@ (64-bit)"

RequestExecutionLevel highest
SetCompressor /SOLID lzma

# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define PRODUCTVERSION @OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@.@OMNICORE_VERSION_BUILD@
!define VERSION @OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@.@OMNICORE_VERSION_BUILD@
!define VERSION @OMNICORE_VERSION_MAJOR@.@OMNICORE_VERSION_MINOR@.@OMNICORE_VERSION_PATCH@
!define COMPANY "Omni Foundation"
!define URL http://www.omnilayer.org/

Expand All @@ -29,9 +29,7 @@ SetCompressor /SOLID lzma
# Included files
!include Sections.nsh
!include MUI2.nsh
!if "@WINDOWS_BITS@" == "64"
!include x64.nsh
!endif

# Variables
Var StartMenuGroup
Expand All @@ -49,12 +47,8 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English

# Installer attributes
OutFile @abs_top_srcdir@/omnifeather-${VERSION}-win@[email protected]
!if "@WINDOWS_BITS@" == "64"
OutFile @abs_top_srcdir@/omnifeather-${VERSION}-win64-setup.exe
InstallDir "$PROGRAMFILES64\OmniFeather"
!else
InstallDir "$PROGRAMFILES\OmniFeather"
!endif
CRCCheck on
XPStyle on
BrandingText " "
Expand Down Expand Up @@ -156,15 +150,13 @@ SectionEnd
# Installer functions
Function .onInit
InitPluginsDir
!if "@WINDOWS_BITS@" == "64"
${If} ${RunningX64}
; disable registry redirection (enable access to 64-bit portion of registry)
SetRegView 64
${Else}
MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system."
Abort
${EndIf}
!endif
FunctionEnd

# Uninstaller functions
Expand Down

0 comments on commit d938a1d

Please sign in to comment.