Address review comments, fix ch for ARM

jackhorton · jackhorton · commit f36a8ac89994 · 2018-04-19T22:04:47.000-07:00
Also made sure that ch+ICU worked correctly on ARM
diff --git a/bin/ch/ch.vcxproj b/bin/ch/ch.vcxproj
@@ -49,6 +49,11 @@
         $(IcuLibraryDependencies);
         %(AdditionalDependencies)
       </AdditionalDependencies>
+      <!-- Unsure why InitializeSecurityDescriptor, SetSecurityDescriptorDacl, and others require this only for ARM -->
+      <AdditionalDependencies Condition="'$(ChakraICU)'=='static' AND '$(Platform)'=='ARM'">
+        advapi32.lib;
+        %(AdditionalDependencies)
+      </AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/deps/Chakra.ICU/Chakra.ICU.Common.vcxproj b/deps/Chakra.ICU/Chakra.ICU.Common.vcxproj
@@ -29,7 +29,11 @@
     </ClCompile>
     <Link Condition="'$(ChakraICU)'=='shared'">
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib</AdditionalDependencies>
+      <!-- Unsure why InitializeSecurityDescriptor, SetSecurityDescriptorDacl, and others require this only for ARM -->
+      <AdditionalDependencies Condition="'$(Platform)'=='ARM'">
+        advapi32.lib;
+        %(AdditionalDependencies)
+      </AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup Condition="'$(BuildLocalICU)'=='true'">
