zynaddsubfx

commit 69a7257cc834589c933a54718d024769491cba98
parent a6086ad2586d3f912c5f5054d1e7b43066702ee7
Author: paulnasca <paulnasca>
Date:   Wed,  6 Apr 2005 21:19:04 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
2
+-
M
src/main.C
 | 
12
++++++++++--
M
src/zynaddsubfx.nsi
 | 
6
+++---

3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -782,7 +782,7 @@
 	      Corectata o mica eroare care facea ca daca se foloseste setarea 440Hz la Padsynth sa se aleaga sample-ul incorect
 05 Apr 2005 - Modificat installerul pt. windows si pregatit pt. installer (folosit cross-compiling si nsis&wine)
 	    - Adaugat icon in format windows (si la installer)
-	    
+	    - Adaugat parametrul '-Y' la linia de comanda, care este folosit doar pentru installerul NSIS (parametrul este necesar pentru ca NSIS ma forteaza sa dau un parametru la program pentru ca sa adauge un icon la shortcut; zynaddsubfx ignora acest parametru)
 
 
     
 \ No newline at end of file
diff --git a/src/main.C b/src/main.C
@@ -367,6 +367,7 @@ int main(int argc, char *argv[]){
 	{"swap",2,NULL,'S'},
 	{"no-gui",2,NULL,'U'},
 	{"not-use-jack",2,NULL,'A'},
+	{"dummy",2,NULL,'Y'},
 	{"help",2,NULL,'h'},
 	{0,0,0,0}
     };
@@ -378,10 +379,10 @@ int main(int argc, char *argv[]){
     
     while (1){
 #ifdef OS_LINUX
-	opt=getopt_long(argc,argv,"l:r:b:o:hSDUA",opts,&option_index);
+	opt=getopt_long(argc,argv,"l:r:b:o:hSDUAY",opts,&option_index);
 	char *optarguments=optarg;
 #else
-	opt=getopt(argc,argv,"l:r:b:o:hSDUA",&option_index);
+	opt=getopt(argc,argv,"l:r:b:o:hSDUAY",&option_index);
 	char *optarguments=&winoptarguments[0];
 #endif 
 
@@ -391,6 +392,13 @@ int main(int argc, char *argv[]){
 	switch(opt){
 	    case 'h':exitwithhelp=1;
 		     break;
+	    case 'Y':/* this command a dummy command (has NO effect) 
+		        and is used because I need for NSIS installer 
+			(NSIS sometimes forces a command line for a 
+			program, even if I don't need that; eg. when 
+			I want to add a icon to a shortcut.
+		      */
+		     break;
 	    case 'U':noui=1;
 		     break;
 	    case 'A':
diff --git a/src/zynaddsubfx.nsi b/src/zynaddsubfx.nsi
@@ -90,9 +90,9 @@ Section "Standalone" SEC02
   File "zynaddsubfx.exe"
   File "launch_zynaddsubfx.bat"
   CreateDirectory "$SMPROGRAMS\ZynAddSubFX"
-  CreateShortCut "$SMPROGRAMS\ZynAddSubFX\ZynAddSubFX low latency.lnk" "$INSTDIR\launch_zynaddsubfx.bat" "" "zynaddsubfx_icon.ico" 
-  CreateShortCut "$SMPROGRAMS\ZynAddSubFX\ZynAddSubFX.lnk" "$INSTDIR\zynaddsubfx.exe"
-  CreateShortCut "$DESKTOP\ZynAddSubFX.lnk" "$INSTDIR\launch_zynaddsubfx.bat" "" "zynaddsubfx_icon.ico"
+  CreateShortCut "$SMPROGRAMS\ZynAddSubFX\ZynAddSubFX low latency.lnk" "$INSTDIR\launch_zynaddsubfx.bat" "-Y" "zynaddsubfx_icon.ico" 
+  CreateShortCut "$SMPROGRAMS\ZynAddSubFX\ZynAddSubFX.lnk" "$INSTDIR\zynaddsubfx.exe" "-Y" "zynaddsubfx_icon.ico"
+  CreateShortCut "$DESKTOP\ZynAddSubFX.lnk" "$INSTDIR\launch_zynaddsubfx.bat" "-Y" "zynaddsubfx_icon.ico"
 SectionEnd
 
 ;Section /o "VST Plugin" SEC03