From 705ea18b2ad42165d6747964798b42ef14922ec2 Mon Sep 17 00:00:00 2001
From: Scott Ehlert <ds@alliedmods.net>
Date: Tue, 6 Oct 2009 01:46:06 -0500
Subject: [PATCH] Really fixed version.rc file problem by removing and
 recreating build OUTPUT directory when required (bug 4042, r=dvander).

---
 AMBuildScript               | 1 +
 tools/buildbot/bootstrap.pl | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/AMBuildScript b/AMBuildScript
index 9e0ef484..442a109e 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -153,6 +153,7 @@ class SM:
 			self.targetMap = AMBuild.cache['targetMap']
 
 		if AMBuild.target['platform'] == 'windows':
+			self.compiler.AddToListVar('RCINCLUDES', os.path.join(AMBuild.sourceFolder, 'public'))
 			self.compiler.AddToListVar('RCINCLUDES',
 			                           os.path.join(AMBuild.outputFolder, 'includes'))
 		self.mmsPath = AMBuild.cache['MMSOURCE17']
diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl
index eab7c803..74fd0152 100755
--- a/tools/buildbot/bootstrap.pl
+++ b/tools/buildbot/bootstrap.pl
@@ -4,6 +4,7 @@
 use strict;
 use Cwd;
 use File::Basename;
+use File::Path;
 
 my ($myself, $path) = fileparse($0);
 chdir($path);
@@ -20,7 +21,6 @@ my $reconf = 0;
 
 #Create output folder if it doesn't exist.
 if (!(-d 'OUTPUT')) {
-	mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
 	$reconf = 1;
 } else {
 	if (-f 'OUTPUT/sentinel') {
@@ -40,6 +40,8 @@ if (!(-d 'OUTPUT')) {
 }
 
 if ($reconf) {
+	rmtree('OUTPUT');
+	mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
 	chdir('OUTPUT');
 	my ($result);
 	print "Attempting to reconfigure...\n";