From 99b9aede9fdf869850e0eaa7a8b913fa83bcda41 Mon Sep 17 00:00:00 2001 From: asfernandes Date: Fri, 14 Mar 2008 11:06:48 +0000 Subject: [PATCH] Revert the ICU include directory changes --- builds/win32/msvc7/engine.vcproj | 4 ++-- builds/win32/msvc7/engine_classic.vcproj | 2 +- builds/win32/msvc7/engine_embed.vcproj | 4 ++-- builds/win32/msvc7/intl.vcproj | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builds/win32/msvc7/engine.vcproj b/builds/win32/msvc7/engine.vcproj index 9d0296201c..161a8cafd5 100644 --- a/builds/win32/msvc7/engine.vcproj +++ b/builds/win32/msvc7/engine.vcproj @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" Optimization="0" - AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/source/i18n;../../../extern/icu/source/common;../../../src/vulcan" + AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,DEV_BUILD,NAMESPACE=Vulcan" ExceptionHandling="FALSE" BasicRuntimeChecks="3" @@ -81,7 +81,7 @@ ImproveFloatingPointConsistency="TRUE" FavorSizeOrSpeed="1" OmitFramePointers="TRUE" - AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/source/i18n;../../../extern/icu/source/common;../../../src/vulcan" + AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,NAMESPACE=Vulcan" ExceptionHandling="FALSE" RuntimeLibrary="2" diff --git a/builds/win32/msvc7/engine_classic.vcproj b/builds/win32/msvc7/engine_classic.vcproj index 2ca68a4e5d..dc9b556d70 100644 --- a/builds/win32/msvc7/engine_classic.vcproj +++ b/builds/win32/msvc7/engine_classic.vcproj @@ -81,7 +81,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" Optimization="0" - AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/source/i18n;../../../extern/icu/source/common;../../../src/vulcan" + AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,DEV_BUILD,NAMESPACE=Vulcan" ExceptionHandling="FALSE" BasicRuntimeChecks="3" diff --git a/builds/win32/msvc7/engine_embed.vcproj b/builds/win32/msvc7/engine_embed.vcproj index 34355014eb..687a57e96d 100644 --- a/builds/win32/msvc7/engine_embed.vcproj +++ b/builds/win32/msvc7/engine_embed.vcproj @@ -29,7 +29,7 @@ ImproveFloatingPointConsistency="TRUE" FavorSizeOrSpeed="1" OmitFramePointers="TRUE" - AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/source/i18n;../../../extern/icu/source/common;../../../src/vulcan" + AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,EMBEDDED,NAMESPACE=Vulcan" ExceptionHandling="FALSE" RuntimeLibrary="2" @@ -82,7 +82,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" Optimization="0" - AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/source/i18n;../../../extern/icu/source/common;../../../src/vulcan" + AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,_X86_,SUPERSERVER,DEV_BUILD,EMBEDDED,NAMESPACE=Vulcan" ExceptionHandling="FALSE" BasicRuntimeChecks="3" diff --git a/builds/win32/msvc7/intl.vcproj b/builds/win32/msvc7/intl.vcproj index 7b4f9e0f3d..abe12ecbcc 100644 --- a/builds/win32/msvc7/intl.vcproj +++ b/builds/win32/msvc7/intl.vcproj @@ -28,7 +28,7 @@ ImproveFloatingPointConsistency="TRUE" FavorSizeOrSpeed="1" OmitFramePointers="TRUE" - AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/source/i18n;../../../extern/icu/source/common" + AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include" PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;INTL_EXPORTS;WINDOWS_ONLY;SUPERCLIENT;WIN32;_X86_" ExceptionHandling="FALSE" RuntimeLibrary="2" @@ -94,7 +94,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc-" Optimization="0" - AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/source/i18n;../../../extern/icu/source/common" + AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include" PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;_X86_;DEV_BUILD" ExceptionHandling="FALSE" BasicRuntimeChecks="3"