Title: [156059] trunk/Source/WTF
- Revision
- 156059
- Author
- bfulg...@apple.com
- Date
- 2013-09-18 13:45:20 -0700 (Wed, 18 Sep 2013)
Log Message
[Windows] Unreviewed build correction.
* WTF.vcxproj/WTFGeneratedCommon.props: Export PLATFORMARCHITECTURE macro for use in
Makefiles and shell scripts.
* WTF.vcxproj/build-generated-files.sh: Output header search path to identify when the build
is confused about build architecture.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (156058 => 156059)
--- trunk/Source/WTF/ChangeLog 2013-09-18 20:33:11 UTC (rev 156058)
+++ trunk/Source/WTF/ChangeLog 2013-09-18 20:45:20 UTC (rev 156059)
@@ -1,3 +1,12 @@
+2013-09-18 Brent Fulgham <bfulg...@apple.com>
+
+ [Windows] Unreviewed build correction.
+
+ * WTF.vcxproj/WTFGeneratedCommon.props: Export PLATFORMARCHITECTURE macro for use in
+ Makefiles and shell scripts.
+ * WTF.vcxproj/build-generated-files.sh: Output header search path to identify when the build
+ is confused about build architecture.
+
2013-09-18 Anders Carlsson <ander...@apple.com>
RefPtrHashMap should work with move only types
Modified: trunk/Source/WTF/WTF.vcxproj/WTFGeneratedCommon.props (156058 => 156059)
--- trunk/Source/WTF/WTF.vcxproj/WTFGeneratedCommon.props 2013-09-18 20:33:11 UTC (rev 156058)
+++ trunk/Source/WTF/WTF.vcxproj/WTFGeneratedCommon.props 2013-09-18 20:45:20 UTC (rev 156059)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
- <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Label="UserMacros">
+ <PLATFORMARCHITECTURE>32</PLATFORMARCHITECTURE>
+ </PropertyGroup>
<PropertyGroup />
<PropertyGroup />
<PropertyGroup />
@@ -11,5 +13,10 @@
<ItemDefinitionGroup>
<BuildLog />
</ItemDefinitionGroup>
- <ItemGroup />
+ <ItemGroup>
+ <BuildMacro Include="PLATFORMARCHITECTURE">
+ <Value>$(PLATFORMARCHITECTURE)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh (156058 => 156059)
--- trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh 2013-09-18 20:33:11 UTC (rev 156058)
+++ trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh 2013-09-18 20:45:20 UTC (rev 156059)
@@ -6,6 +6,7 @@
if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \)
then
mkdir -p "$(dirname "${ICUVERSION_H_PATH}")"
+ echo "Checking ${UNVERSIONED_ICU_LIB_PATH}"
test ! -f "${UNVERSIONED_ICU_LIB_PATH}"
echo "#define U_DISABLE_RENAMING $?" > "${ICUVERSION_H_PATH}"
fi
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
