fixed NSIS installer trying to include packages if present; removed server from installer, since it no longer exists

This commit is contained in:
Chris Forbes
2010-03-10 18:48:22 +13:00
parent 36b3578dec
commit 74b0a9139b
2 changed files with 9 additions and 7 deletions

4
.gitignore vendored
View File

@@ -39,4 +39,6 @@ settings.ini
#monodevelop #monodevelop
*.pidb *.pidb
*.userprefs *.userprefs
packaging/windows/*.exe

View File

@@ -65,7 +65,7 @@ Section "Client" Client
File "..\..\OpenRA.Game\OpenRA.ico" File "..\..\OpenRA.Game\OpenRA.ico"
File /r "..\..\thirdparty\Tao\*.dll" File "..\..\thirdparty\Tao\*.dll"
File "cg.dll" File "cg.dll"
File "cgGL.dll" File "cgGL.dll"
@@ -77,13 +77,13 @@ Section "Client" Client
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END
SetOutPath "$INSTDIR\shaders" SetOutPath "$INSTDIR\shaders"
File /r "..\..\shaders\*.fx" File "..\..\shaders\*.fx"
SectionEnd SectionEnd
SectionGroup /e "Mods" SectionGroup /e "Mods"
Section "Red Alert" RA Section "Red Alert" RA
SetOutPath "$INSTDIR\mods\ra" SetOutPath "$INSTDIR\mods\ra"
File /r "..\..\mods\ra\*.*" File "..\..\mods\ra\*.*"
MessageBox MB_YESNO "Setup will now download and install the Red Alert packages.$\n\ MessageBox MB_YESNO "Setup will now download and install the Red Alert packages.$\n\
The size of the download will be approximately 7MB in size.$\n\ The size of the download will be approximately 7MB in size.$\n\
If you do not wish to download them at this time, you can find instructions on how to \ If you do not wish to download them at this time, you can find instructions on how to \
@@ -99,7 +99,7 @@ SectionGroup /e "Mods"
SectionEnd SectionEnd
Section "Command & Conquer" CNC Section "Command & Conquer" CNC
SetOutPath "$INSTDIR\mods\cnc" SetOutPath "$INSTDIR\mods\cnc"
File /r "..\..\mods\cnc\*.*" File "..\..\mods\cnc\*.*"
MessageBox MB_YESNO "Setup will now download and install the Command and Conquer packages.$\n\ MessageBox MB_YESNO "Setup will now download and install the Command and Conquer packages.$\n\
The size of the download will be approximately 6MB in size.$\n\ The size of the download will be approximately 6MB in size.$\n\
@@ -116,11 +116,11 @@ SectionGroup /e "Mods"
SectionEnd SectionEnd
Section "Red Alert: Aftermath" Aftermath Section "Red Alert: Aftermath" Aftermath
SetOutPath "$INSTDIR\mods\aftermath" SetOutPath "$INSTDIR\mods\aftermath"
File /r "..\..\mods\aftermath\*.*" File "..\..\mods\aftermath\*.*"
SectionEnd SectionEnd
Section "Red Alert: Next Generation" RA_NG Section "Red Alert: Next Generation" RA_NG
SetOutPath "$INSTDIR\mods\ra-ng" SetOutPath "$INSTDIR\mods\ra-ng"
File /r "..\..\mods\ra-ng\*.*" File "..\..\mods\ra-ng\*.*"
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd