summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2017-10-01 17:07:02 +0100
committerAndy Williams <andy@andywilliams.me>2017-10-01 18:09:46 +0100
commit10ba064b65e02befec19cfb89657ebf86a0a95f1 (patch)
tree6bda091cc7cdaedd18f8a2c59505eff1e7bc5d4e /m4
parent3462390b5cda12ca0b37cf00a2a20a5d3636d4b5 (diff)
Windows: remove XP support and forbid compilation and run on this platform
Test Plan: run on XP Reviewers: jpeg, cedric, ajwillia.ms Reviewed By: ajwillia.ms Subscribers: ajwillia.ms Differential Revision: https://phab.enlightenment.org/D5245
Diffstat (limited to 'm4')
-rw-r--r--m4/efl.m42
-rw-r--r--m4/evil_windows.m411
2 files changed, 6 insertions, 7 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index a8ca427..4b896ed 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -427,7 +427,7 @@ m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS} ${EFLALL_LIBS}
427m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" 427m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
428USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la" 428USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
429USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la" 429USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
430m4_defn([UP])_CFLAGS="${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1" 430m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1"
431requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}" 431requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}"
432requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}" 432requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}"
433 433
diff --git a/m4/evil_windows.m4 b/m4/evil_windows.m4
index c59e95d..8876d6c 100644
--- a/m4/evil_windows.m4
+++ b/m4/evil_windows.m4
@@ -12,15 +12,15 @@ AC_DEFUN([EFL_SELECT_WINDOWS_VERSION],
12dnl configure option 12dnl configure option
13 13
14AC_ARG_WITH([windows-version], 14AC_ARG_WITH([windows-version],
15 [AC_HELP_STRING([--with-windows-version], [select the target Windows version (xp, vista or win7) @<:@default=win7@:>@])], 15 [AC_HELP_STRING([--with-windows-version], [select the target Windows version (vista or win7) @<:@default=win7@:>@])],
16 [ 16 [
17 if test "x${with_windows_version}" = "xvista" ; then 17 if test "x${with_windows_version}" = "xvista" ; then
18 _winver="vista" 18 _winver="vista"
19 else 19 else
20 if test "x${with_windows_version}" = "xxp" ; then 20 if test "x${with_windows_version}" = "xwin7" ; then
21 _winver="xp"
22 else
23 _winver="win7" 21 _winver="win7"
22 else
23 _winver="error"
24 fi 24 fi
25 fi 25 fi
26 ], 26 ],
@@ -39,8 +39,7 @@ case "${_winver}" in
39 _efl_windows_version="Windows 7" 39 _efl_windows_version="Windows 7"
40 ;; 40 ;;
41 *) 41 *)
42 EFL_WINDOWS_VERSION_CFLAGS="-D_WIN32_WINNT=0x0501" 42 AC_MSG_ERROR([Wrong Windows version passed to configure. Run ./configure --help])
43 _efl_windows_version="Windows XP"
44 ;; 43 ;;
45esac 44esac
46 45