From 2a07e46e345e9541ee0e5147d0945d31dc541b48 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Fri, 12 May 2006 22:55:12 +0000
Subject: [PATCH] allow msvc build to work from source directory with a space
 in it.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1454 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/mod/codecs/mod_g729/mod_g729.vcproj                   | 4 ++--
 src/mod/codecs/mod_gsm/mod_gsm.vcproj                     | 4 ++--
 src/mod/codecs/mod_ilbc/mod_ilbc.vcproj                   | 4 ++--
 src/mod/codecs/mod_speex/mod_speex.vcproj                 | 4 ++--
 .../dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj    | 4 ++--
 src/mod/directories/mod_ldap/mod_ldap.vcproj              | 4 ++--
 src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj      | 4 ++--
 src/mod/endpoints/mod_exosip/mod_exosip.vcproj            | 4 ++--
 src/mod/endpoints/mod_iax/mod_iax.vcproj                  | 4 ++--
 src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj      | 4 ++--
 .../event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj   | 4 ++--
 src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj   | 4 ++--
 src/mod/formats/mod_sndfile/mod_sndfilel.vcproj           | 4 ++--
 .../languages/mod_spidermonkey/mod_spidermonkey.vcproj    | 4 ++--
 src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj            | 4 ++--
 w32/vsnet/FreeSwitchCore.vcproj                           | 4 ++--
 w32/vsnet/GetLibs.vbs                                     | 8 ++++----
 w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj             | 4 ++--
 18 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/mod/codecs/mod_g729/mod_g729.vcproj b/src/mod/codecs/mod_g729/mod_g729.vcproj
index f1f90d9826..334dd8b436 100644
--- a/src/mod/codecs/mod_g729/mod_g729.vcproj
+++ b/src/mod/codecs/mod_g729/mod_g729.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_CodecG729 Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_CodecG729 Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_CodecG729 Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_CodecG729 Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/codecs/mod_gsm/mod_gsm.vcproj b/src/mod/codecs/mod_gsm/mod_gsm.vcproj
index 953f9bf7cd..a5e32f151d 100644
--- a/src/mod/codecs/mod_gsm/mod_gsm.vcproj
+++ b/src/mod/codecs/mod_gsm/mod_gsm.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_CodecGSM Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_CodecGSM Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_CodecGSM Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_CodecGSM Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj b/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
index 1800d14d24..508e0247f2 100644
--- a/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
+++ b/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_ilbc Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_ilbc Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -108,7 +108,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_ilbc Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_ilbc Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/codecs/mod_speex/mod_speex.vcproj b/src/mod/codecs/mod_speex/mod_speex.vcproj
index 9e56387482..65b3f86d84 100644
--- a/src/mod/codecs/mod_speex/mod_speex.vcproj
+++ b/src/mod/codecs/mod_speex/mod_speex.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_SpeexCodec Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_SpeexCodec Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_SpeexCodec Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_SpeexCodec Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj
index 3c5811d8ef..4095a85f17 100644
--- a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj
+++ b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_dialplan_xml Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_dialplan_xml Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_dialplan_xml Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_dialplan_xml Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/directories/mod_ldap/mod_ldap.vcproj b/src/mod/directories/mod_ldap/mod_ldap.vcproj
index 8d5c7c0081..73adbb2a43 100644
--- a/src/mod/directories/mod_ldap/mod_ldap.vcproj
+++ b/src/mod/directories/mod_ldap/mod_ldap.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_ldap Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_ldap Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_ldap Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_ldap Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj b/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj
index 177276a33e..a335a26239 100644
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Dingaling Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_Dingaling Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -110,7 +110,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Dingaling Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_Dingaling Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/endpoints/mod_exosip/mod_exosip.vcproj b/src/mod/endpoints/mod_exosip/mod_exosip.vcproj
index 714775b1a3..8e7cc3f58c 100644
--- a/src/mod/endpoints/mod_exosip/mod_exosip.vcproj
+++ b/src/mod/endpoints/mod_exosip/mod_exosip.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Exosip Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_Exosip Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -115,7 +115,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Exosip Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_Exosip Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/endpoints/mod_iax/mod_iax.vcproj b/src/mod/endpoints/mod_iax/mod_iax.vcproj
index ec76fca90a..c0e5816dd5 100644
--- a/src/mod/endpoints/mod_iax/mod_iax.vcproj
+++ b/src/mod/endpoints/mod_iax/mod_iax.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_iax Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_iax Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_iax Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_iax Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj b/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
index 05221d0a11..b73a1eec79 100644
--- a/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
+++ b/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_PortAudio Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_PortAudio Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -110,7 +110,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_PortAudio Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_PortAudio Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
index 3e2027b6b0..a030c71608 100644
--- a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
+++ b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_XMPPEvent Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_XMPPEvent Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_XMPPEvent Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_XMPPEvent Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj b/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
index 33a2794f41..63ae7b61b5 100644
--- a/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
+++ b/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs  Mod_zeroconf Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot;  Mod_zeroconf Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs  Mod_zeroconf Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot;  Mod_zeroconf Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj b/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj
index 03d807c47a..8ce74ff19d 100644
--- a/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj
+++ b/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_sndfile Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_sndfile Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_sndfile Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_sndfile Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
index 48ead36cf0..903586a4a9 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_SpiderMonkey Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_SpiderMonkey Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -110,7 +110,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_SpiderMonkey Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_SpiderMonkey Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
index 06f904a07c..a487d602b5 100644
--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
+++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_XMLRpc Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_XMLRpc Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_XMLRpc Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs&quot; Mod_XMLRpc Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index 72b9991205..8afdcd30b6 100644
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)getlibs.vbs Core Debug"
+				CommandLine="cscript /nologo &quot;$(InputDir)getlibs.vbs&quot; Core Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -118,7 +118,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cscript /nologo $(InputDir)getlibs.vbs Core Release"
+				CommandLine="cscript /nologo &quot;$(InputDir)getlibs.vbs&quot; Core Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 599cefd233..e09896fd85 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -895,7 +895,7 @@ Sub CreateSwitchVersion()
 	End If
 	VersionCmd="svnversion " & quote & FreeswitchDir & "." & quote &  " -n"
 	Set MyFile = fso.CreateTextFile(UtilsDir & "svnversion\tmpVersion.Bat", True)
-	MyFile.WriteLine("@" & "cd " & UtilsDir & "svnversion")
+	MyFile.WriteLine("@" & "cd " & quote & UtilsDir & "svnversion" & quote )
 	MyFile.WriteLine("@" & VersionCmd)
 	MyFile.Close
 	Set oExec = WshShell.Exec(UtilsDir & "svnversion\tmpVersion.Bat")
@@ -1051,7 +1051,7 @@ End Sub
 Sub UnCompress(Archive, DestFolder)
 	wscript.echo("Extracting: " & Archive)
 	Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)
-	MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Archive & " -y -o" & DestFolder)
+	MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Archive & quote & " -y -o" & quote & DestFolder & quote )
 	MyFile.Close
 	Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")
 	Do
@@ -1059,7 +1059,7 @@ Sub UnCompress(Archive, DestFolder)
 	Loop While Not OExec.StdOut.atEndOfStream
 	If FSO.FileExists(Left(Archive, Len(Archive)-3))Then  
 		Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)
-		MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Left(Archive, Len(Archive)-3) & " -y -o" & DestFolder)
+		MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & quote & " -y -o" & quote & DestFolder & quote )
 		MyFile.Close
 		Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")
 		Do
@@ -1070,7 +1070,7 @@ Sub UnCompress(Archive, DestFolder)
 	End If
 	If FSO.FileExists(Left(Archive, Len(Archive)-3) & "tar")Then  
 		Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)
-		MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Left(Archive, Len(Archive)-3) & "tar -y -o" & DestFolder)
+		MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & "tar" & quote & " -y -o" & quote & DestFolder & quote )
 		MyFile.Close
 		Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")
 		Do
diff --git a/w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj b/w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj
index eef8ef4415..af703fbd1a 100644
--- a/w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj
+++ b/w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj
@@ -90,7 +90,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(ProjectDir)pcre_chartables.c"
+				CommandLine="&quot;$(TargetPath)&quot; &quot;$(ProjectDir)pcre_chartables.c&quot;"
 			/>
 		</Configuration>
 		<Configuration
@@ -168,7 +168,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetPath) $(ProjectDir)pcre_chartables.c"
+				CommandLine="&quot;$(TargetPath)&quot; &quot;$(ProjectDir)pcre_chartables.c&quot;"
 			/>
 		</Configuration>
 	</Configurations>