X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2Fmicropeak-windows.nsi.in;h=34f5908d38a15c1c9eb79bf6a909dc38e74ee44d;hb=30e4e286eec31e69ad1e69a44cf00d4549a09f88;hp=a3779630630b40ded1c6b3b8756b6e491f957f23;hpb=21ff52befb27decc4b23458315620c47d7a07b21;p=fw%2Faltos

diff --git a/micropeak/micropeak-windows.nsi.in b/micropeak/micropeak-windows.nsi.in
index a3779630..34f5908d 100644
--- a/micropeak/micropeak-windows.nsi.in
+++ b/micropeak/micropeak-windows.nsi.in
@@ -62,15 +62,6 @@ UninstPage instfiles
 
 ; And the stuff to install
 
-Section "FTDI USB Driver"
-	SetOutPath $INSTDIR
-
-	File "CDM20824_Setup.exe"
-
-	StrCpy $2 "$INSTDIR\CDM20824_Setup.exe"
-	ExecWait $2
-SectionEnd
-
 Section "Install Driver" InstDriver
 
 	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial
@@ -104,16 +95,26 @@ Section "${REG_NAME} Application"
 	File "altosuilib_@ALTOSUILIB_VERSION@.jar"
 	File "jfreechart.jar"
 	File "jcommon.jar"
+	File "../icon/${WIN_APP_EXE}"
 
 	File "*.dll"
 
 	File "../icon/${WIN_APP_ICON}"
 
-	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${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 "FTDI USB Driver"
+	SetOutPath $INSTDIR
+
+	File "CDM_v2.12.00_WHQL_Certified.exe"
+
+	StrCpy $2 "$INSTDIR\CDM_v2.12.00_WHQL_Certified.exe"
+	ExecWait $2
 SectionEnd
 
 Section "Documentation"
@@ -129,11 +130,8 @@ Section "File Associations"
 
 	SetOutPath $INSTDIR
 
-	File "../icon/${WIN_APP_EXE}"
 	File "../icon/${WIN_MPD_EXE}"
 
-	SearchPath $1 "javaw.exe"
-
 	; application elements
 	
 	DeleteRegKey HKCR "${PROG_ID}"
@@ -143,7 +141,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" ""				'"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_MPD}\shell\play\command" ""				'"$INSTDIR\${WIN_APP_EXE}" "%1"'
 
 	; .mpd elements