stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r469534 - /incubator/stdcxx/trunk/etc/config/windows/configure.wsf
Date Tue, 31 Oct 2006 15:54:05 GMT
Author: faridz
Date: Tue Oct 31 07:54:04 2006
New Revision: 469534

URL: http://svn.apache.org/viewvc?view=rev&rev=469534
Log:
2006-10-31 Farid Zaripov <faridz@kyiv.vdiweb.com>

	* configure.wsf (configure): Remove VS_UNICODE_OUTPUT
	environment variable before run cl.exe

Modified:
    incubator/stdcxx/trunk/etc/config/windows/configure.wsf

Modified: incubator/stdcxx/trunk/etc/config/windows/configure.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/configure.wsf?view=diff&rev=469534&r1=469533&r2=469534
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/configure.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/configure.wsf Tue Oct 31 07:54:04 2006
@@ -73,7 +73,6 @@
 var stageFile = stageDir + "\\" + configFileName;
 var srcDir = slnDir + "\\etc\\config\\src";
 var includeDir = slnDir + "\\include";
-var logFileName = "config.log";
 var runWindowMode = 0;
 var timeOut = 30000; // 30 sec
 var logFileName = "config.log";
@@ -189,6 +188,10 @@
     appendLineToOutFile("// Configured " + msg);
     
     var logFileNameURI = "file://" + logFileName.replace(/\\/mg, "/");
+
+    // remove VS_UNICODE_OUTPUT environment variable
+    // http://blogs.msdn.com/freik/archive/2006/04/05/569025.aspx
+    WshShell.Environment("PROCESS").Remove("VS_UNICODE_OUTPUT");
     
     getCompilerOpts(WScript.Arguments.Named("SolutionName"));
     
@@ -209,7 +212,7 @@
         LDFLAGS += " /DEBUG";
     }
 
-    CPPFLAGS += joinArray(new Array(stageDir, slnDir + "\\include", includeDir), "/I");
+    CPPFLAGS += joinArray(new Array(stageDir, includeDir), "/I");
     
     var defines = new Array("_RWSTD_USE_CONFIG");
     



Mime
View raw message