Merge branch 'drop-snowberry'

skyjake · Feb 16, 2013 · 7396581 · 7396581
2 parents d0bc389 + 388d1f2
commit 7396581
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/distrib/win32/dorel.bat b/distrib/win32/dorel.bat
@@ -36,7 +36,11 @@ REM -- Update readme (could also run Amethyst here).
 copy "C:\Users\Virtual\Dropbox\Doomsday\readme\readme.txt" ..\products\doc
 
 REM -- Run the Inno Setup Compiler.
-"C:\Program Files\Inno Setup 5\Compil32.exe" /cc setup.iss
+IF EXIST "c:\Program Files\Inno Setup 5\Compil32.exe" (
+    "C:\Program Files\Inno Setup 5\Compil32.exe" /cc setup.iss
+) ELSE (
+    "C:\Program Files (x86)\Inno Setup 5\Compil32.exe" /cc setup.iss
+)
 
 goto TheEnd
 

diff --git a/distrib/win32/setup.iss.template b/distrib/win32/setup.iss.template
@@ -154,9 +154,11 @@ Filename: "{app}\doomsday.url"; Section: "InternetShortcut"; Key: "URL"; String:
 
 [Icons]
 Name: "{group}\Doomsday Engine"; Filename: "{app}\snowberry\snowberry.exe"; WorkingDir: "{app}\snowberry"; Flags: createonlyiffileexists
+Name: "{group}\Doomsday Shell"; Filename: "{app}\bin\doomsday-shell.exe"; WorkingDir: "{app}"; Flags: createonlyiffileexists
 Name: "{group}\{cm:ProgramOnTheWeb,Doomsday Engine}"; Filename: "{app}\doomsday.url"
 Name: "{group}\{cm:UninstallProgram,Doomsday Engine}"; Filename: "{uninstallexe}"
 Name: "{userdesktop}\Doomsday Engine"; Filename: "{app}\snowberry\snowberry.exe"; WorkingDir: "{app}\snowberry"; Tasks: desktopicon; Flags: createonlyiffileexists
+Name: "{userdesktop}\Doomsday Shell"; Filename: "{app}\bin\doomsday-shell.exe"; WorkingDir: "{app}"; Tasks: desktopicon; Flags: createonlyiffileexists
 
 [Run]
 Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q"; Flags: runascurrentuser