Commit ac5c6ad6 authored by bfulgham@apple.com's avatar bfulgham@apple.com

[Windows] Unreviewed build/link improvement after r155127 to be

consistent about using debug-build support libraries.

Now that <rdar://problem/9898937> is resolved, we should be linking
to debug AVFoundationCF as well.

* page/CaptionUserPreferencesMediaAF.cpp: Link to AVFoundationCF_debug
when building with the DEBUG_ALL target.
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: Ditto.
* platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h: Ditto.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155130 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5b327c65
2013-09-05 Brent Fulgham <bfulgham@apple.com>
[Windows] Unreviewed build/link improvement after r155127 to be
consistent about using debug-build support libraries.
Now that <rdar://problem/9898937> is resolved, we should be linking
to debug AVFoundationCF as well.
* page/CaptionUserPreferencesMediaAF.cpp: Link to AVFoundationCF_debug
when building with the DEBUG_ALL target.
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: Ditto.
* platform/graphics/avfoundation/cf/AVFoundationCFSoftLinking.h: Ditto.
2013-09-04 Anders Carlsson <andersca@apple.com>
Vector::releaseBuffer should return an OwnPtr
......@@ -65,7 +65,13 @@
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_POINTER_OPTIONAL(Lib, Name, Type)
#define SOFT_LINK_AVF_FRAMEWORK_IMPORT(Lib, Fun, ReturnType, Arguments, Signature) SOFT_LINK(Lib, Fun, ReturnType, Arguments, Signature)
#else
#ifdef DEBUG_ALL
#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_DEBUG_LIBRARY(Lib)
#else
#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_LIBRARY(Lib)
#endif
#define SOFT_LINK_AVF(Lib, Name, Type) SOFT_LINK_DLL_IMPORT(Lib, Name, Type)
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_VARIABLE_DLL_IMPORT_OPTIONAL(Lib, Name, Type)
#define SOFT_LINK_AVF_FRAMEWORK_IMPORT(Lib, Fun, ReturnType, Arguments, Signature) SOFT_LINK_DLL_IMPORT(Lib, Fun, ReturnType, __cdecl, Arguments, Signature)
......
......@@ -42,7 +42,12 @@
#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_FRAMEWORK_OPTIONAL(Lib)
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_POINTER_OPTIONAL(Lib, Name, Type)
#else
#ifdef DEBUG_ALL
#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_DEBUG_LIBRARY(Lib)
#else
#define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_LIBRARY(Lib)
#endif
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_VARIABLE_DLL_IMPORT_OPTIONAL(Lib, Name, Type)
#endif
......
......@@ -28,8 +28,7 @@
// Soft-link against AVFoundationCF functions and variables required by MediaPlayerPrivateAVFoundationCF.cpp.
#ifdef DEBUG_ALL
// FIXME: <rdar://problem/9898937> AVFoundationCF doesn't currently deliver a debug library.
SOFT_LINK_LIBRARY(AVFoundationCF)
SOFT_LINK_DEBUG_LIBRARY(AVFoundationCF)
#else
SOFT_LINK_LIBRARY(AVFoundationCF)
#endif
......
......@@ -1009,7 +1009,11 @@ void MediaPlayerPrivateQuickTimeVisualContext::getSupportedTypes(HashSet<String>
bool MediaPlayerPrivateQuickTimeVisualContext::isAvailable()
{
#ifdef DEBUG_ALL
return false;
#else
return QTMovie::initializeQuickTime();
#endif
}
MediaPlayer::SupportsType MediaPlayerPrivateQuickTimeVisualContext::supportsType(const String& type, const String& codecs, const KURL&)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment