wxUSE_GSTREAMER is Unix-specific, remove it from common wx/setup_inc.h; it also requires wxUSE_THREADS, check for it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6528a7f145
commit
5508feb8f7
10 changed files with 21 additions and 64 deletions
|
|
@ -577,14 +577,6 @@
|
|||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use GStreamer for Unix.
|
||||
//
|
||||
// Default is 0 as this requires a lot of dependencies which might not be
|
||||
// available.
|
||||
//
|
||||
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
|
|
|
|||
|
|
@ -577,14 +577,6 @@
|
|||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use GStreamer for Unix.
|
||||
//
|
||||
// Default is 0 as this requires a lot of dependencies which might not be
|
||||
// available.
|
||||
//
|
||||
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
|
|
|
|||
|
|
@ -577,14 +577,6 @@
|
|||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use GStreamer for Unix.
|
||||
//
|
||||
// Default is 0 as this requires a lot of dependencies which might not be
|
||||
// available.
|
||||
//
|
||||
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
|
|
|
|||
|
|
@ -577,14 +577,6 @@
|
|||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use GStreamer for Unix.
|
||||
//
|
||||
// Default is 0 as this requires a lot of dependencies which might not be
|
||||
// available.
|
||||
//
|
||||
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
|
|
|
|||
|
|
@ -578,14 +578,6 @@
|
|||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use GStreamer for Unix.
|
||||
//
|
||||
// Default is 0 as this requires a lot of dependencies which might not be
|
||||
// available.
|
||||
//
|
||||
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
|
|
|
|||
|
|
@ -577,14 +577,6 @@
|
|||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use GStreamer for Unix.
|
||||
//
|
||||
// Default is 0 as this requires a lot of dependencies which might not be
|
||||
// available.
|
||||
//
|
||||
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
|
|
|
|||
|
|
@ -573,14 +573,6 @@
|
|||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use GStreamer for Unix.
|
||||
//
|
||||
// Default is 0 as this requires a lot of dependencies which might not be
|
||||
// available.
|
||||
//
|
||||
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
|
|
|
|||
|
|
@ -576,14 +576,6 @@
|
|||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
|
||||
// Use GStreamer for Unix.
|
||||
//
|
||||
// Default is 0 as this requires a lot of dependencies which might not be
|
||||
// available.
|
||||
//
|
||||
// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
// Default is 1
|
||||
|
|
|
|||
|
|
@ -20,3 +20,14 @@
|
|||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_CONSOLE_EVENTLOOP */
|
||||
|
||||
#if wxUSE_GSTREAMER
|
||||
# if !wxUSE_THREADS
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "GStreamer requires threads"
|
||||
# else
|
||||
# undef wxUSE_GSTREAMER
|
||||
# define wxUSE_GSTREAMER 0
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_GSTREAMER */
|
||||
|
|
|
|||
10
setup.h.in
10
setup.h.in
|
|
@ -567,6 +567,16 @@
|
|||
#define wxUSE_UNICODE_UTF8 0
|
||||
#define wxUSE_UTF8_LOCALE_ONLY 0
|
||||
|
||||
/*
|
||||
Use GStreamer for Unix.
|
||||
|
||||
Default is 0 as this requires a lot of dependencies which might not be
|
||||
available.
|
||||
|
||||
Recommended setting: 1 (wxMediaCtrl won't work by default without it).
|
||||
*/
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
/* --- start MSW options --- */
|
||||
|
||||
#ifndef wxUSE_UNICODE_MSLU
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue