summaryrefslogtreecommitdiff
path: root/micropeak
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-02-06 03:31:07 -0800
committerKeith Packard <keithp@keithp.com>2015-02-06 03:31:07 -0800
commitcc707432c6eaedb9587bb63ac570146b356b6bfd (patch)
tree33ef88e4560e4548fb2eac8de1b3e62e84225a18 /micropeak
parent1fc5c8625f649b43d93f23a5fa1ba16773f2d0db (diff)
micropeak: Fix file association registry install on Windows
Need to invoke DisableX64FSRedirection before setting file association registry entries or Windows won't find our application. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'micropeak')
-rw-r--r--micropeak/micropeak-windows.nsi.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in
index 848523b0..baa153e9 100644
--- a/micropeak/micropeak-windows.nsi.in
+++ b/micropeak/micropeak-windows.nsi.in
@@ -86,7 +86,7 @@ Section "${REG_NAME} Application"
File "../icon/${WIN_APP_ICON}"
- CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$SYSDIR\javaw.exe" "-jar ${FAT_NAME}" "$INSTDIR\${WIN_APP_ICON}"
+ CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}" "" "$INSTDIR\${WIN_APP_ICON}"
SectionEnd
Section "${REG_NAME} Desktop Shortcut"
@@ -102,11 +102,15 @@ SectionEnd
Section "File Associations"
+ ${DisableX64FSRedirection}
+
SetOutPath $INSTDIR
File "../icon/${WIN_APP_EXE}"
File "../icon/${WIN_MPD_EXE}"
+ SearchPath $1 "javaw.exe"
+
; application elements
DeleteRegKey HKCR "${PROG_ID}"
@@ -116,7 +120,7 @@ Section "File Associations"
WriteRegStr HKCR "${PROG_ID_MPD}" "FriendlyTypeName" "MicroPeak Data File"
WriteRegStr HKCR "${PROG_ID_MPD}\CurVer" "" "${PROG_ID_MPD}"
WriteRegStr HKCR "${PROG_ID_MPD}\DefaultIcon" "" '"$INSTDIR\${WIN_MPD_EXE}",-101'
- WriteRegExpandStr HKCR "${PROG_ID_MPD}\shell\play\command" "" '"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+ WriteRegExpandStr HKCR "${PROG_ID_MPD}\shell\play\command" "" '"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
; .mpd elements