Changeset 45831 in webkit
- Timestamp:
- Jul 13, 2009 11:34:44 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r45830 r45831 1 2009-07-13 Brent Fulgham <bfulgham@webkit.org> 2 3 Reviewed by Adam Roben. 4 5 Add new configuration flag for redistributable Windows build. 6 https://bugs.webkit.org/show_bug.cgi=27087 7 8 * WebCore.vcproj/WebCore.vcproj: Add new WinCairo.vsprops to 9 Debug_Cairo and Release_Cairo builds. 10 * config.h: Check for presence of WIN_CAIRO and select appropriate 11 configuration. Defaults to standard Apple build. 12 1 13 2009-07-13 Peter Kasting <pkasting@google.com> 2 14 -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r45830 r45831 185 185 Name="Debug_Cairo|Win32" 186 186 ConfigurationType="4" 187 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops; .\WebCoreCommon.vsprops;.\WebCoreCairo.vsprops;.\WebCoreCURL.vsprops"187 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCairo.vsprops;.\WebCoreCURL.vsprops" 188 188 CharacterSet="1" 189 189 > … … 240 240 Name="Release_Cairo|Win32" 241 241 ConfigurationType="4" 242 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops; .\WebCoreCommon.vsprops;.\WebCoreCairo.vsprops;.\WebCoreCURL.vsprops"242 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCairo.vsprops;.\WebCoreCURL.vsprops" 243 243 CharacterSet="1" 244 244 WholeProgramOptimization="1" … … 24260 24260 </File> 24261 24261 <File 24262 RelativePath="..\html\CollectionCache.cpp" 24263 > 24264 <FileConfiguration 24265 Name="Release_PGO|Win32" 24266 > 24267 <Tool 24268 Name="VCCLCompilerTool" 24269 WholeProgramOptimization="true" 24270 /> 24271 </FileConfiguration> 24272 </File> 24273 <File 24274 RelativePath="..\html\CollectionCache.h" 24275 > 24276 </File> 24277 <File 24278 RelativePath="..\html\CollectionType.h" 24279 > 24280 </File> 24281 <File 24282 RelativePath="..\html\DataGridColumn.cpp" 24283 > 24284 </File> 24285 <File 24286 RelativePath="..\html\DataGridColumn.h" 24287 > 24288 </File> 24289 <File 24290 RelativePath="..\html\DataGridColumnList.cpp" 24291 > 24292 </File> 24293 <File 24294 RelativePath="..\html\DataGridColumnList.h" 24295 > 24296 </File> 24297 <File 24298 RelativePath="..\html\DataGridDataSource.h" 24299 > 24300 </File> 24301 <File 24262 24302 RelativePath="..\html\DOMDataGridDataSource.cpp" 24263 24303 > … … 24265 24305 <File 24266 24306 RelativePath="..\html\DOMDataGridDataSource.h" 24267 >24268 </File>24269 <File24270 RelativePath="..\html\CollectionCache.cpp"24271 >24272 <FileConfiguration24273 Name="Release_PGO|Win32"24274 >24275 <Tool24276 Name="VCCLCompilerTool"24277 WholeProgramOptimization="true"24278 />24279 </FileConfiguration>24280 </File>24281 <File24282 RelativePath="..\html\CollectionCache.h"24283 >24284 </File>24285 <File24286 RelativePath="..\html\CollectionType.h"24287 >24288 </File>24289 <File24290 RelativePath="..\html\DataGridColumn.cpp"24291 >24292 </File>24293 <File24294 RelativePath="..\html\DataGridColumn.h"24295 >24296 </File>24297 <File24298 RelativePath="..\html\DataGridColumnList.cpp"24299 >24300 </File>24301 <File24302 RelativePath="..\html\DataGridColumnList.h"24303 >24304 </File>24305 <File24306 RelativePath="..\html\DataGridDataSource.h"24307 24307 > 24308 24308 </File> -
trunk/WebCore/config.h
r44702 r45831 108 108 109 109 #if PLATFORM(WIN) 110 #if defined(WIN_CAIRO) 111 #undef WTF_PLATFORM_CG 112 #define WTF_PLATFORM_CAIRO 1 113 #undef WTF_USE_CFNETWORK 114 #define WTF_USE_CURL 1 115 #ifndef _WINSOCKAPI_ 116 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h 117 #endif 118 #else 110 119 #define WTF_PLATFORM_CG 1 111 120 #undef WTF_PLATFORM_CAIRO 112 121 #define WTF_USE_CFNETWORK 1 122 #undef WTF_USE_CURL 123 #endif 113 124 #undef WTF_USE_WININET 114 125 #define WTF_PLATFORM_CF 1 -
trunk/WebKit/win/ChangeLog
r45789 r45831 1 2009-07-13 Brent Fulgham <bfulgham@webkit.org> 2 3 Reviewed by Adam Roben. 4 5 Add new configuration flag for redistributable Windows build. 6 https://bugs.webkit.org/show_bug.cgi=27087 7 8 * WebKit.vcproj/WebKit.vcproj: Add new WinCairo.vsprops to 9 Debug_Cairo and Release_Cairo targets. 10 1 11 2009-07-12 Brent Fulgham <bfulgham@gmail.com> 2 12 -
trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj
r45695 r45831 248 248 IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)" 249 249 ConfigurationType="2" 250 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops "250 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops" 251 251 CharacterSet="1" 252 252 > … … 326 326 IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)" 327 327 ConfigurationType="2" 328 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops "328 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops" 329 329 CharacterSet="1" 330 330 WholeProgramOptimization="1" -
trunk/WebKitLibraries/ChangeLog
r45744 r45831 1 2009-07-13 Brent Fulgham <bfulgham@webkit.org> 2 3 Reviewed by Adam Roben. 4 5 Add new configuration flag for redistributable Windows build. 6 https://bugs.webkit.org/show_bug.cgi=27087 7 8 * win/tools/vsprops/WinCairo.vsprops: Added. Defines the 9 new WIN_CAIRO flag used to drive non-Apple Windows build. 10 1 11 2009-07-10 Eric Carlson <eric.carlson@apple.com> 2 12 -
trunk/WebKitTools/ChangeLog
r45817 r45831 1 2009-07-13 Brent Fulgham <bfulgham@webkit.org> 2 3 Reviewed by Adam Roben. 4 5 Add new configuration flag for redistributable Windows build. 6 https://bugs.webkit.org/show_bug.cgi=27087 7 8 * DumpRenderTree/config.h: Check for presence of WIN_CAIRO and 9 select appropriate configuration. Defaults to standard Apple build. 10 * DumpRenderTree/win/DumpRenderTree.vcproj: Add new WinCairo.vsprops 11 to Debug_Cairo and Release_Cairo targets. 12 1 13 2009-07-13 Simon Hausmann <simon.hausmann@nokia.com> 2 14 -
trunk/WebKitTools/DumpRenderTree/config.h
r45509 r45831 37 37 #if PLATFORM(WIN) 38 38 #define WTF_PLATFORM_CF 1 39 #if defined(WIN_CAIRO) 40 #define WTF_PLATFORM_CAIRO 1 41 #define WTF_USE_CURL 1 42 #else 39 43 #define WTF_PLATFORM_CG 1 44 #define WTF_USE_CFNETWORK 1 45 #endif 40 46 41 47 #undef _WIN32_WINNT -
trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
r45505 r45831 235 235 Name="Debug_Cairo|Win32" 236 236 ConfigurationType="1" 237 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops "237 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops" 238 238 CharacterSet="1" 239 239 > … … 307 307 Name="Release_Cairo|Win32" 308 308 ConfigurationType="1" 309 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops "309 InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops" 310 310 CharacterSet="1" 311 311 WholeProgramOptimization="1"
Note: See TracChangeset
for help on using the changeset viewer.