aboutsummaryrefslogtreecommitdiff
path: root/tools/mhmake/src/mhmake.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-08-04 11:56:03 +0000
committermarha <marha@users.sourceforge.net>2009-08-04 11:56:03 +0000
commite5838b892c8f8041868d3ee08110261cde13e098 (patch)
treef69d9e97a800f62bcf8798199559b0d96abd14a9 /tools/mhmake/src/mhmake.cpp
parente2cafb0970b536247274e86ae949beeb7ab1e814 (diff)
downloadvcxsrv-e5838b892c8f8041868d3ee08110261cde13e098.tar.gz
vcxsrv-e5838b892c8f8041868d3ee08110261cde13e098.tar.bz2
vcxsrv-e5838b892c8f8041868d3ee08110261cde13e098.zip
- Made copy command recursive when copying a directory.
- When -q is specified output nothing. - Solved problem when mhmake is run from inside Visual Studio (output of cl.exe was send directly to the IDE instead of stdout) - Added strip function - Now use the svn info command to get the revision from the working copy. - Removed VC6 solution file.
Diffstat (limited to 'tools/mhmake/src/mhmake.cpp')
-rw-r--r--tools/mhmake/src/mhmake.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/mhmake/src/mhmake.cpp b/tools/mhmake/src/mhmake.cpp
index 7e9b117b2..375621fb4 100644
--- a/tools/mhmake/src/mhmake.cpp
+++ b/tools/mhmake/src/mhmake.cpp
@@ -50,6 +50,15 @@ int __CDECL main(int argc, char* argv[])
//_CrtSetBreakAlloc(44);
#endif
+ #ifdef WIN32
+ /* Remove the VS_UNICODE_OUTPUT environment variable. This variable is set when running from
+ * the Visual Studio IDE and is causing the output of cl.exe to send the output directly to the IDE instead
+ * of sending it to stdout. This is causing all scripts that are calling cl.exe and intercept the
+ * output to fail.
+ */
+ putenv("VS_UNICODE_OUTPUT=");
+ #endif
+
try
{
mhmakefileparser::InitBuildTime();