cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=16b0733a528fd41aa669e25d6cb363d9f5c47d66
commit 16b0733a528fd41aa669e25d6cb363d9f5c47d66 Author: Cedric BAIL <[email protected]> Date: Thu Oct 5 16:23:50 2017 -0700 build: fix make examples on Windows Summary: We should define the windows version before including evil. Test Plan: Run make examples on windows newer than XP. Reviewers: vtorri Subscribers: jenkins, cedric, jpeg Tags: #efl, #windows Differential Revision: https://phab.enlightenment.org/D5261 Signed-off-by: Cedric BAIL <[email protected]> --- src/examples/eina/Makefile.am | 4 ++++ src/examples/eio/Makefile.am | 4 ++++ src/examples/elocation/Makefile.am | 4 ++++ src/examples/eolian_cxx/Makefile.am | 1 + 4 files changed, 13 insertions(+) diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am index 4ce1258197..0186c72b45 100644 --- a/src/examples/eina/Makefile.am +++ b/src/examples/eina/Makefile.am @@ -12,6 +12,10 @@ if HAVE_WINDOWS AM_CPPFLAGS += \ -I$(top_srcdir)/src/lib/evil \ -I$(top_builddir)/src/lib/evil + +AM_CFLAGS = \ +@EFL_WINDOWS_VERSION_CFLAGS@ + endif LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LDFLAGS@ diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am index 1620d81350..d42f5773f5 100644 --- a/src/examples/eio/Makefile.am +++ b/src/examples/eio/Makefile.am @@ -20,6 +20,10 @@ if HAVE_WINDOWS AM_CPPFLAGS += \ -I$(top_srcdir)/src/lib/evil \ -I$(top_builddir)/src/lib/evil + +AM_CFLAGS = \ +@EFL_WINDOWS_VERSION_CFLAGS@ + endif EXTRA_PROGRAMS = \ diff --git a/src/examples/elocation/Makefile.am b/src/examples/elocation/Makefile.am index 5c08d0c4d6..e84b01625a 100644 --- a/src/examples/elocation/Makefile.am +++ b/src/examples/elocation/Makefile.am @@ -18,6 +18,10 @@ if HAVE_WINDOWS AM_CPPFLAGS += \ -I$(top_srcdir)/src/lib/evil \ -I$(top_builddir)/src/lib/evil + +AM_CFLAGS = \ +@EFL_WINDOWS_VERSION_CFLAGS@ + endif EXTRA_PROGRAMS = \ diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am index ed1224901b..ece53188d0 100644 --- a/src/examples/eolian_cxx/Makefile.am +++ b/src/examples/eolian_cxx/Makefile.am @@ -44,6 +44,7 @@ AM_CXXFLAGS = \ if HAVE_WINDOWS AM_CXXFLAGS += \ +@EFL_WINDOWS_VERSION_CFLAGS@ \ -I$(top_srcdir)/src/lib/evil \ -I$(top_builddir)/src/lib/evil endif --
