On Wed, Jul 05, 2017 at 12:42:21PM +0300, Martin Storsjö wrote: > --- a/configure > +++ b/configure > @@ -4892,9 +4893,21 @@ if enabled libxcb; then > check_pkg_config libxcb_xfixes xcb-xfixes xcb/xfixes.h > xcb_xfixes_get_cursor_image > fi > > +check_cpp <<EOF && enable uwp > +#ifdef WINAPI_FAMILY > +#include <winapifamily.h> > +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) > +#error desktop, not uwp > +#else > +// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP > +#endif > +#else > +#error no family set > +#endif > +EOF > # d3d11va requires linking directly to dxgi and d3d11 if not building for > # the desktop api partition > -enabled LoadLibrary || d3d11va_extralibs="-ldxgi -ld3d11" > +enabled uwp && d3d11va_extralibs="-ldxgi -ld3d11"
You can merge this, as in: # d3d11va requires linking directly to dxgi and d3d11 if not building for # the desktop api partition check_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11" #ifdef WINAPI_FAMILY #include <winapifamily.h> #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #error desktop, not uwp #else // WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP #endif #else #error no family set #endif EOF Feel free to push, preferably with that change applied. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
