From 6f798b9590ca3a26d6c8e9318929eefef9b640f2 Mon Sep 17 00:00:00 2001 From: Michael Wookey Date: Mon, 28 Sep 2009 20:46:52 +1000 Subject: [PATCH] generators/vcproj.pm: remove UNICODE from build Defining UNICODE for MSVC IDE builds results in certain Win32 WIDE API's receiving ANSI strings. The result of which is an invalid use of the API and will end in either data corruption or an application crash. Prevent the use of WIDE API's when building with the MSVC IDE for compatibility with msysGit. Signed-off-by: Michael Wookey Acked-by: Marius Storm-Olsen Signed-off-by: Shawn O. Pearce --- contrib/buildsystems/Generators/Vcproj.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm index 00ec0c1369..a21591109e 100644 --- a/contrib/buildsystems/Generators/Vcproj.pm +++ b/contrib/buildsystems/Generators/Vcproj.pm @@ -173,7 +173,7 @@ sub createLibProject { Optimization="0" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$includes" - PreprocessorDefinitions="UNICODE,WIN32,_DEBUG,$defines" + PreprocessorDefinitions="WIN32,_DEBUG,$defines" MinimalRebuild="true" RuntimeLibrary="1" UsePrecompiledHeader="0" @@ -239,7 +239,7 @@ sub createLibProject { InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="$includes" - PreprocessorDefinitions="UNICODE,WIN32,NDEBUG,$defines" + PreprocessorDefinitions="WIN32,NDEBUG,$defines" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -395,7 +395,7 @@ sub createAppProject { Optimization="0" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$includes" - PreprocessorDefinitions="UNICODE,WIN32,_DEBUG,$defines" + PreprocessorDefinitions="WIN32,_DEBUG,$defines" MinimalRebuild="true" RuntimeLibrary="1" UsePrecompiledHeader="0" @@ -466,7 +466,7 @@ sub createAppProject { InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="$includes" - PreprocessorDefinitions="UNICODE,WIN32,NDEBUG,$defines" + PreprocessorDefinitions="WIN32,NDEBUG,$defines" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" -- 2.11.4.GIT