From e142bf796d013956c2393c882c7f4f6e244751e3 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Wed, 2 Jan 2019 10:34:23 +0100 Subject: Add support of Windows 8, 8.1 and 10 Reviewers: raster, bu5hm4n Reviewed By: bu5hm4n Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7528 --- m4/evil_windows.m4 | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'm4') diff --git a/m4/evil_windows.m4 b/m4/evil_windows.m4 index fff9f8251b..b3fb94e06b 100644 --- a/m4/evil_windows.m4 +++ b/m4/evil_windows.m4 @@ -12,18 +12,8 @@ AC_DEFUN([EFL_SELECT_WINDOWS_VERSION], dnl configure option AC_ARG_WITH([windows-version], - [AC_HELP_STRING([--with-windows-version], [select the target Windows version (vista or win7) @<:@default=win7@:>@])], - [ - if test "x${with_windows_version}" = "xvista" ; then - _winver="vista" - else - if test "x${with_windows_version}" = "xwin7" ; then - _winver="win7" - else - _winver="error" - fi - fi - ], + [AC_HELP_STRING([--with-windows-version], [select the target Windows version (vista, win7, win8, win81 or win10) @<:@default=win7@:>@])], + [_winver=${with_windows_version}], [_winver="win7"]) AC_MSG_CHECKING([which Windows version to target]) @@ -38,6 +28,18 @@ case "${_winver}" in EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0601 -DWINVER=0x0601" _efl_windows_version="Windows 7" ;; + win8) + EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0602 -DWINVER=0x0602" + _efl_windows_version="Windows 8" + ;; + win81) + EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0603 -DWINVER=0x0603" + _efl_windows_version="Windows 8.1" + ;; + win10) + EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00" + _efl_windows_version="Windows 10" + ;; *) AC_MSG_ERROR([Wrong Windows version passed to configure. Run ./configure --help]) ;; @@ -46,5 +48,6 @@ esac EFL_CFLAGS="${EFL_CFLAGS} ${EFL_WINDOWS_VERSION_CFLAGS}" AC_SUBST([EFL_WINDOWS_VERSION_CFLAGS]) AC_SUBST([_efl_windows_version]) +AC_MSG_NOTICE([Targetting ${_efl_windows_version}]) ]) -- cgit v1.2.1