Title: [219306] trunk/Source
- Revision
- 219306
- Author
- [email protected]
- Date
- 2017-07-10 13:09:04 -0700 (Mon, 10 Jul 2017)
Log Message
[Win] Link error when building WTF from WTF.proj project file.
https://bugs.webkit.org/show_bug.cgi?id=174316
<rdar://problem/33178200>
Reviewed by Brent Fulgham.
WTF_CPU_X86 cmake variable needs to be set for link libraries directories to be correct.
Source/WebCore:
* WebCore.vcxproj/WebCore.proj:
Source/WebKit:
* WebKit.vcxproj/WebKit.proj:
Source/WTF:
* WTF.vcxproj/WTF.proj:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (219305 => 219306)
--- trunk/Source/WTF/ChangeLog 2017-07-10 19:49:29 UTC (rev 219305)
+++ trunk/Source/WTF/ChangeLog 2017-07-10 20:09:04 UTC (rev 219306)
@@ -1,3 +1,15 @@
+2017-07-10 Per Arne Vollan <[email protected]>
+
+ [Win] Link error when building WTF from WTF.proj project file.
+ https://bugs.webkit.org/show_bug.cgi?id=174316
+ <rdar://problem/33178200>
+
+ Reviewed by Brent Fulgham.
+
+ WTF_CPU_X86 cmake variable needs to be set for link libraries directories to be correct.
+
+ * WTF.vcxproj/WTF.proj:
+
2017-07-03 Brian Burg <[email protected]>
Web Replay: remove some unused code
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (219305 => 219306)
--- trunk/Source/WTF/WTF.vcxproj/WTF.proj 2017-07-10 19:49:29 UTC (rev 219305)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.proj 2017-07-10 20:09:04 UTC (rev 219306)
@@ -46,9 +46,9 @@
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
- <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
Modified: trunk/Source/WebCore/ChangeLog (219305 => 219306)
--- trunk/Source/WebCore/ChangeLog 2017-07-10 19:49:29 UTC (rev 219305)
+++ trunk/Source/WebCore/ChangeLog 2017-07-10 20:09:04 UTC (rev 219306)
@@ -1,3 +1,15 @@
+2017-07-10 Per Arne Vollan <[email protected]>
+
+ [Win] Link error when building WTF from WTF.proj project file.
+ https://bugs.webkit.org/show_bug.cgi?id=174316
+ <rdar://problem/33178200>
+
+ Reviewed by Brent Fulgham.
+
+ WTF_CPU_X86 cmake variable needs to be set for link libraries directories to be correct.
+
+ * WebCore.vcxproj/WebCore.proj:
+
2017-07-10 Jeremy Jones <[email protected]>
media element handle adding source immediately before src.
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (219305 => 219306)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2017-07-10 19:49:29 UTC (rev 219305)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2017-07-10 20:09:04 UTC (rev 219306)
@@ -54,9 +54,9 @@
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
- <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
Modified: trunk/Source/WebKit/ChangeLog (219305 => 219306)
--- trunk/Source/WebKit/ChangeLog 2017-07-10 19:49:29 UTC (rev 219305)
+++ trunk/Source/WebKit/ChangeLog 2017-07-10 20:09:04 UTC (rev 219306)
@@ -1,3 +1,15 @@
+2017-07-10 Per Arne Vollan <[email protected]>
+
+ [Win] Link error when building WTF from WTF.proj project file.
+ https://bugs.webkit.org/show_bug.cgi?id=174316
+ <rdar://problem/33178200>
+
+ Reviewed by Brent Fulgham.
+
+ WTF_CPU_X86 cmake variable needs to be set for link libraries directories to be correct.
+
+ * WebKit.vcxproj/WebKit.proj:
+
2017-07-05 Don Olmstead <[email protected]>
[WinCairo] Consolidate CMake code related to CURL
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj (219305 => 219306)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj 2017-07-10 19:49:29 UTC (rev 219305)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj 2017-07-10 20:09:04 UTC (rev 219306)
@@ -54,9 +54,9 @@
<Target Name="Build" AfterTargets="PreBuild">
<Message Text="Building $(CONFIGURATION) Solution" />
<Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
- <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 14 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
- <Exec Command="$(CMakeCommandCommon) -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
+ <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 14 2015 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
<Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
</Target>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
