diff options
author | Руслан Ижбулатов <lrn1986@gmail.com> | 2016-04-20 07:36:00 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2016-04-27 23:18:16 -0400 |
commit | 026cb53875244d252b55110dd91efacf29a1657f (patch) | |
tree | 1d7c8ae8c5ebbdb2d74e3aec34e3d1213e2c4aee /configure.ac | |
parent | 5c1d0915afd1e1e5a84523da7a9597f9ad68df99 (diff) | |
download | gtk+-026cb53875244d252b55110dd91efacf29a1657f.tar.gz |
win32: Port to new monitor api
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 4cdfe2ef38..702cb04867 100644 --- a/configure.ac +++ b/configure.ac @@ -385,7 +385,7 @@ if test "$enable_win32_backend" = "yes"; then backend_immodules="$backend_immodules,ime" GDK_WINDOWING="$GDK_WINDOWING #define GDK_WINDOWING_WIN32" - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi" + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32" AM_CONDITIONAL(USE_WIN32, true) PANGO_PACKAGES="pangowin32 pangocairo" else @@ -756,6 +756,54 @@ case $host in ;; esac +AS_CASE([$host_os], + [mingw*], + [ + AC_CHECK_SIZEOF( + [DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY], + [], + [ +#define _WIN32_WINNT 0x601 +#include <windows.h> + ] + ) + AS_IF( + [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x4], + [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is OK])], + [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x0], + [AC_MSG_ERROR([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is unavailable])], + [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is not OK])] + ) + AC_MSG_CHECKING([for SetupDiGetDevicePropertyW]) + gtk_save_LIBS="$LIBS" + LIBS="-lsetupapi $LIBS" + AC_TRY_LINK( + [ +#define _WIN32_WINNT 0x0600 +#include <windows.h> +#include <devpropdef.h> +#include <setupapi.h> + ], + [return SetupDiGetDevicePropertyW(NULL, NULL, NULL, NULL, NULL, 0, NULL, 0);], + [have_SetupDiGetDevicePropertyW=yes], + [have_SetupDiGetDevicePropertyW=no] + ) + AS_IF( + [test x$have_SetupDiGetDevicePropertyW = xyes], + [ + AC_DEFINE( + [HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W], + [1], + [Define to 1 if SetupDiGetDevicePropertyW() is available] + ) + ] + ) + AC_MSG_RESULT([$have_SetupDiGetDevicePropertyW]) + LIBS="$gtk_save_LIBS" + ], + [] +) + AC_SUBST(MATH_LIB) # # see bug 162979 |