From 74b0a9139b7745561dec988a003cd58976c337d1 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Wed, 10 Mar 2010 18:48:22 +1300
Subject: [PATCH] fixed NSIS installer trying to include packages if present;
 removed server from installer, since it no longer exists

---
 .gitignore                   |  4 +++-
 packaging/windows/OpenRA.nsi | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6326f7432..af30229f6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,6 @@ settings.ini
 
 #monodevelop
 *.pidb
-*.userprefs
\ No newline at end of file
+*.userprefs
+
+packaging/windows/*.exe
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 1e82d9473f..27d36b673a 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -65,7 +65,7 @@ Section "Client" Client
 	
 	File "..\..\OpenRA.Game\OpenRA.ico"
 	
-	File /r "..\..\thirdparty\Tao\*.dll"
+	File "..\..\thirdparty\Tao\*.dll"
 	
 	File "cg.dll"
 	File "cgGL.dll"
@@ -77,13 +77,13 @@ Section "Client" Client
 	!insertmacro MUI_STARTMENU_WRITE_END
 	
 	SetOutPath "$INSTDIR\shaders"
-	File /r "..\..\shaders\*.fx"
+	File "..\..\shaders\*.fx"
 SectionEnd
 
 SectionGroup /e "Mods"
 	Section "Red Alert" 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\
 			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 \
@@ -99,7 +99,7 @@ SectionGroup /e "Mods"
 	SectionEnd
 	Section "Command & Conquer" 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\
 			The size of the download will be approximately 6MB in size.$\n\
@@ -116,11 +116,11 @@ SectionGroup /e "Mods"
 	SectionEnd
 	Section "Red Alert: Aftermath" Aftermath
 		SetOutPath "$INSTDIR\mods\aftermath"
-		File /r "..\..\mods\aftermath\*.*"
+		File "..\..\mods\aftermath\*.*"
 	SectionEnd
 	Section "Red Alert: Next Generation" RA_NG
 		SetOutPath "$INSTDIR\mods\ra-ng"
-		File /r "..\..\mods\ra-ng\*.*"
+		File "..\..\mods\ra-ng\*.*"
 	SectionEnd
 SectionGroupEnd