Changeset 152426 in webkit


Ignore:
Timestamp:
Jul 5, 2013 3:17:27 PM (11 years ago)
Author:
Brent Fulgham
Message:

[Windows] Identify OS-level at build-time.
​https://bugs.webkit.org/show_bug.cgi?id=118428

Reviewed by Anders Carlsson.

../WebCore:

  • DerivedSources.make: Activate legible output features if present.
  • WebCorePrefix.h: Activate MSVC 2010 workarounds for CGFloat if

building with VS2010.

  • config.h: Activate legible output features if present.

../WTF:

  • WTF.vcxproj/WTFGenerated.make: Check for Legible Output featurs

and set build environment as appropriate.

  • wtf/Platform.h: Activate Legible Output features if present.
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r152418 r152426  
     12013-07-05  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Windows] Identify OS-level at build-time.
     4        https://bugs.webkit.org/show_bug.cgi?id=118428
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WTF.vcxproj/WTFGenerated.make: Check for Legible Output featurs
     9        and set build environment as appropriate.
     10        * wtf/Platform.h: Activate Legible Output features if present.
     11
    1122013-07-05  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
    213

  • trunk/Source/WTF/WTF.vcxproj/WTFGenerated.make

    r149220 r152426  
    1 all:
     1all: WTFHeaderDetection.h
    22    touch "%ConfigurationBuildDir%\buildfailed"
    33    bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "$(DEBUGSUFFIX)"
    … …  
    1111clean:
    1212    -del "%ConfigurationBuildDir%\buildfailed"
     13    -del "%ConfigurationBuildDir%\include\private\wtf\WTFHeaderDetection.h"
    1314    copy-files.cmd clean
     15
     16# Header detection
     17WTFHeaderDetection.h: WTFGenerated.make
     18    -mkdir "%ConfigurationBuildDir%\include\private\wtf
     19    <<testOSXLevel.cmd
     20IF EXIST "%ConfigurationBuildDir%\include\private\wtf\$@" exit
     21echo "" > "%ConfigurationBuildDir%\include\private\wtf\$@"
     22IF EXIST "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" (echo #define __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 1090 > "%ConfigurationBuildDir%\include\private\wtf\$@")
     23<<

  • trunk/Source/WTF/wtf/Platform.h

    r152035 r152426  
    626626#define HAVE_ALIGNED_MALLOC 1
    627627#define HAVE_ISDEBUGGERPRESENT 1
     628
     629#include <WTF/WTFHeaderDetection.h>
     630
    628631#endif
    629632
    … …  
    961964#endif
    962965
    963 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
     966#if (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    964967#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
    965968#endif
    966969
    967 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     970#if (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    968971#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
    969972#endif

  • trunk/Source/WebCore/ChangeLog

    r152425 r152426  
     12013-07-05  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Windows] Identify OS-level at build-time.
     4        https://bugs.webkit.org/show_bug.cgi?id=118428
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * DerivedSources.make: Activate legible output features if present.
     9        * WebCorePrefix.h: Activate MSVC 2010 workarounds for CGFloat if
     10        building with VS2010.
     11        * config.h: Activate legible output features if present.
     12
    1132013-07-05  Tim Horton  <timothy_horton@apple.com>
    214

  • trunk/Source/WebCore/DerivedSources.make

    r152404 r152426  
    11181118
    11191119WebCoreHeaderDetection.h : DerivedSources.make
    1120         if [ -f "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFBase.h" ]||[ -f "$(WEBKITLIBRARIESDIR)/include/AVFoundationCF/AVCFBase.h" ]; then echo "#define HAVE_AVCF 1" > $@; else echo > $@; fi
     1120        if [ -f "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" ]||[ -f "$(WEBKITLIBRARIESDIR)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" ]; then echo "#define HAVE_AVCF_LEGIBLE_OUTPUT 1" > $@; else echo > $@; fi
    11211121
    11221122endif # Windows_NT

  • trunk/Source/WebCore/WebCorePrefix.h

    r152386 r152426  
    139139
    140140#if defined(_MSC_VER) && _MSC_VER <= 1600
     141
     142#include <WebCore/WebCoreHeaderDetection.h>
     143
     144#if HAVE(AVCF_LEGIBLE_OUTPUT)
    141145// These must be defined before including CGFloat.h
    142146// This can be removed once we move to VS2012 or newer
    … …  
    145149
    146150#define isnan _isnan
     151#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     152#include <CoreGraphics/CGFloat.h>
     153#endif
    147154#include <CoreGraphics/CoreGraphics.h>
    148155#undef isnan
     156#endif
    149157#endif
    150158

  • trunk/Source/WebCore/config.h

    r151610 r152426  
    137137// FIXME: Move this to JavaScriptCore/wtf/Platform.h, which is where we define WTF_USE_AVFOUNDATION on the Mac.
    138138// https://bugs.webkit.org/show_bug.cgi?id=67334
    139 #if PLATFORM(WIN) && HAVE(AVCF)
     139#if PLATFORM(WIN)
    140140#define WTF_USE_AVFOUNDATION 1
     141
     142#if HAVE(AVCF_LEGIBLE_OUTPUT)
     143#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
     144#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
    141145#endif
    142146
     147#endif
     148
Note: See TracChangeset for help on using the changeset viewer.