Changeset 219306 in webkit


Ignore:
Timestamp:
Jul 10, 2017 1:09:04 PM (7 years ago)
Author:
pvollan@apple.com
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:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r219301 r219306  
     12017-07-10  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] Link error when building WTF from WTF.proj project file.
     4        https://bugs.webkit.org/show_bug.cgi?id=174316
     5        <rdar://problem/33178200>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        WTF_CPU_X86 cmake variable needs to be set for link libraries directories to be correct.
     10
     11        * WTF.vcxproj/WTF.proj:
     12
    1132017-07-03  Brian Burg  <bburg@apple.com>
    214
  • trunk/Source/WTF/WTF.vcxproj/WTF.proj

    r208275 r219306  
    4747    <Message Text="Building $(CONFIGURATION) Solution" />
    4848    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
    49         <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
     49        <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
    5050        <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
    51         <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
     51        <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
    5252        <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
    5353  </Target>
  • trunk/Source/WebCore/ChangeLog

    r219305 r219306  
     12017-07-10  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] Link error when building WTF from WTF.proj project file.
     4        https://bugs.webkit.org/show_bug.cgi?id=174316
     5        <rdar://problem/33178200>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        WTF_CPU_X86 cmake variable needs to be set for link libraries directories to be correct.
     10
     11        * WebCore.vcxproj/WebCore.proj:
     12
    1132017-07-10  Jeremy Jones  <jeremyj@apple.com>
    214
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj

    r207794 r219306  
    5555    <Message Text="Building $(CONFIGURATION) Solution" />
    5656    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
    57         <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
     57        <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
    5858        <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
    59         <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
     59        <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
    6060        <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
    6161  </Target>
  • trunk/Source/WebKit/ChangeLog

    r219156 r219306  
     12017-07-10  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] Link error when building WTF from WTF.proj project file.
     4        https://bugs.webkit.org/show_bug.cgi?id=174316
     5        <rdar://problem/33178200>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        WTF_CPU_X86 cmake variable needs to be set for link libraries directories to be correct.
     10
     11        * WebKit.vcxproj/WebKit.proj:
     12
    1132017-07-05  Don Olmstead  <don.olmstead@sony.com>
    214
  • trunk/Source/WebKit/WebKit.vcxproj/WebKit.proj

    r208275 r219306  
    5555    <Message Text="Building $(CONFIGURATION) Solution" />
    5656    <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />
    57         <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
     57        <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G &quot;Visual Studio 14 2015&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
    5858        <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>
    59         <Exec Command="$(CMakeCommandCommon) -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
     59        <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G &quot;Visual Studio 14 2015 Win64&quot;" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
    6060        <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>
    6161  </Target>
Note: See TracChangeset for help on using the changeset viewer.