Add icu i18n include directory and lib to vcxproj files

dilijev · dilijev · commit a04cde6ce70c · 2017-09-21T02:33:40.000-07:00
diff --git a/bin/ChakraCore/ChakraCore.vcxproj b/bin/ChakraCore/ChakraCore.vcxproj
@@ -32,6 +32,7 @@
         $(IntDir);
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         $(MSBuildThisFileDirectory)..\..\lib\JITClient;
         %(AdditionalIncludeDirectories);
       </AdditionalIncludeDirectories>
@@ -56,10 +57,9 @@
       <AdditionalDependencies Condition="'$(IntlICU)'=='true'">
         %(AdditionalDependencies);
         <!-- TODO cleanup: we do need to link to ICU libraries in ChakraCore, but we probably will not need all of them -->
-        <!--$(IcuLibDir)\icudata.lib;-->
-        <!--$(IcuLibDir)\icui18n.lib;-->
-        <!--$(IcuLibDir)\icustubdata.lib;-->
         $(IcuLibDir)\icutools.lib;
+        $(IcuLibDir)\icui18n.lib;
+        <!--$(IcuLibDir)\icudata.lib;-->
         <!--$(IcuLibDir)\icuucx.lib;-->
       </AdditionalDependencies>
       <DelayLoadDLLs>%(DelayLoadDLLs);oleaut32.dll</DelayLoadDLLs>
diff --git a/lib/Backend/Chakra.Backend.vcxproj b/lib/Backend/Chakra.Backend.vcxproj
@@ -37,6 +37,7 @@
         $(MSBuildThisFileDirectory)..\WasmReader;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/lib/JITServer/Chakra.JITServer.vcxproj b/lib/JITServer/Chakra.JITServer.vcxproj
@@ -49,6 +49,7 @@
         $(MSBuildThisFileDirectory)..\Backend;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/lib/Jsrt/Chakra.Jsrt.vcxproj b/lib/Jsrt/Chakra.Jsrt.vcxproj
@@ -25,6 +25,7 @@
         $(MSBuildThisFileDirectory)..\Runtime;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         $(MSBuildThisFileDirectory)..\JITClient;
         $(MSBuildThisFileDirectory)..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\Common;
diff --git a/lib/Jsrt/Core/Chakra.Jsrt.Core.vcxproj b/lib/Jsrt/Core/Chakra.Jsrt.Core.vcxproj
@@ -26,6 +26,7 @@
         $(MSBuildThisFileDirectory)..\..\Runtime;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
         $(MSBuildThisFileDirectory)..\..\Common;
diff --git a/lib/Parser/Chakra.Parser.vcxproj b/lib/Parser/Chakra.Parser.vcxproj
@@ -29,6 +29,7 @@
         $(MSBuildThisFileDirectory)..\Runtime\ByteCode;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         $(ChakraManifestsIncludeDirectory);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
diff --git a/lib/Runtime/Base/Chakra.Runtime.Base.vcxproj b/lib/Runtime/Base/Chakra.Runtime.Base.vcxproj
@@ -29,6 +29,7 @@
         $(MSBuildThisFileDirectory)..\..\WasmReader;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
diff --git a/lib/Runtime/ByteCode/Chakra.Runtime.ByteCode.vcxproj b/lib/Runtime/ByteCode/Chakra.Runtime.ByteCode.vcxproj
@@ -30,6 +30,7 @@
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -105,4 +106,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
diff --git a/lib/Runtime/Debug/Chakra.Runtime.Debug.vcxproj b/lib/Runtime/Debug/Chakra.Runtime.Debug.vcxproj
@@ -35,6 +35,7 @@
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -113,4 +114,4 @@
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
     <Import Project="$(BuildConfig_ARMASM_Path)armasm.targets" />
   </ImportGroup>
-</Project>
+</Project>
diff --git a/lib/Runtime/Language/Chakra.Runtime.Language.vcxproj b/lib/Runtime/Language/Chakra.Runtime.Language.vcxproj
@@ -36,6 +36,7 @@
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -311,4 +312,4 @@
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
     <Import Project="$(BuildConfig_ARMASM_Path)armasm.targets" />
   </ImportGroup>
-</Project>
+</Project>
diff --git a/lib/Runtime/Library/Chakra.Runtime.Library.vcxproj b/lib/Runtime/Library/Chakra.Runtime.Library.vcxproj
@@ -35,6 +35,7 @@
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common; <!-- // TODO (doilij): At end of IntlICU development, remove this if it is not needed here. -->
+        $(IcuIncludeDir)\i18n;
         $(MSBuildThisFileDirectory)..\Math;
         $(ChakraManifestsIncludeDirectory);
         $(ManifestsInboxIncludeDirectory);
diff --git a/lib/Runtime/Math/Chakra.Runtime.Math.vcxproj b/lib/Runtime/Math/Chakra.Runtime.Math.vcxproj
@@ -30,6 +30,7 @@
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -69,4 +70,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
diff --git a/lib/Runtime/PlatformAgnostic/Chakra.Runtime.PlatformAgnostic.vcxproj b/lib/Runtime/PlatformAgnostic/Chakra.Runtime.PlatformAgnostic.vcxproj
@@ -29,6 +29,7 @@
         $(MSBuildThisFileDirectory)..\..\Backend;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(MSBuildThisFileDirectory)..;$(MSBuildThisFileDirectory);
         %(AdditionalIncludeDirectories)
diff --git a/lib/Runtime/Types/Chakra.Runtime.Types.vcxproj b/lib/Runtime/Types/Chakra.Runtime.Types.vcxproj
@@ -30,6 +30,7 @@
         $(MSBuildThisFileDirectory)..\..\JITClient;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -115,4 +116,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
diff --git a/lib/WasmReader/Chakra.WasmReader.vcxproj b/lib/WasmReader/Chakra.WasmReader.vcxproj
@@ -30,6 +30,7 @@
         $(MSBuildThisFileDirectory)..\JITClient;
         $(ChakraJITIDLIntDir);
         $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -76,4 +77,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
