X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2Ftelegps-windows.nsi.in;h=c83b21c5a17f2b371c3091c80bf32cc941264049;hp=603d4971faf6ca5e93d2a01340790c665367092a;hb=f49763bf4a6cd8b2a47abfbec7ef3d8c8c029b8f;hpb=1b0f56ddb2b85b68232c22a7a8b8744cb9ad76f9

diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in
index 603d4971..c83b21c5 100644
--- a/telegps/telegps-windows.nsi.in
+++ b/telegps/telegps-windows.nsi.in
@@ -103,16 +103,17 @@ Section "${REG_NAME} Application"
 	File "freetts.jar"
 	File "jfreechart.jar"
 	File "jcommon.jar"
+	File "../icon/${WIN_APP_EXE}"
 
 	File "*.dll"
 
 	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\${WIN_APP_EXE}" "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "${REG_NAME} Desktop Shortcut"
-	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}"  "" "$INSTDIR\${WIN_APP_ICON}"
+	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}"  "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "TeleGPS, TeleDongle and TeleBT Firmware"
@@ -120,8 +121,10 @@ Section "TeleGPS, TeleDongle and TeleBT Firmware"
 	SetOutPath $INSTDIR
 
 	File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx"
-	File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
-	File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx"
+	File "../src/telegps-v2.0/telegps-v2.0-${VERSION}.ihx"
+	File "../src/teledongle-v3.0/teledongle-v3.0-${VERSION}.ihx"
+	File "../src/telebt-v3.0/telebt-v3.0-${VERSION}.ihx"
+	File "../src/telebt-v4.0/telebt-v4.0-${VERSION}.ihx"
 
 SectionEnd
 
@@ -140,7 +143,6 @@ Section "File Associations"
 
 	SetOutPath $INSTDIR
 
-	File "../icon/${WIN_APP_EXE}"
 	File "../icon/${WIN_TELEM_EXE}"
 	File "../icon/${WIN_EEPROM_EXE}"
 
@@ -158,7 +160,7 @@ Section "File Associations"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}"		"FriendlyTypeName"		"Altus Metrum Log File"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}\CurVer"	""				"${PROG_ID_EEPROM}"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}\DefaultIcon" ""				'"$INSTDIR\${WIN_EEPROM_EXE}",-101'
-  WriteRegExpandStr HKCR "${PROG_ID_EEPROM}\shell\open\command" ""			'"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_EEPROM}\shell\open\command" ""			'"$INSTDIR\${WIN_APP_EXE}" "%1"'
 
 	WriteRegStr HKCR ".eeprom"			""				"${PROG_ID_EEPROM}"
 	WriteRegStr HKCR ".eeprom"			"PerceivedType"			"Altus Metrum Log File"
@@ -173,7 +175,7 @@ Section "File Associations"
 	WriteRegStr HKCR "${PROG_ID_TELEM}"		"FriendlyTypeName"		"Altus Metrum Telemetry File"
 	WriteRegStr HKCR "${PROG_ID_TELEM}\CurVer"	""				"${PROG_ID_TELEM}"
 	WriteRegStr HKCR "${PROG_ID_TELEM}\DefaultIcon" ""				'"$INSTDIR\${WIN_TELEM_EXE}",-101'
-  WriteRegExpandStr HKCR "${PROG_ID_TELEM}\shell\open\command" ""			'"%SYSTEMROOT%\System32\javaw.exe" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_TELEM}\shell\open\command" ""			'"$INSTDIR\${WIN_APP_EXE}" "%1"'
 
 	WriteRegStr HKCR ".telem"			""				"${PROG_ID_TELEM}"
 	WriteRegStr HKCR ".telem"			"PerceivedType"			"Altus Metrum Telemetry File"