diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index d8f75a6b1d..4093f704e6 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -281,6 +281,16 @@ AC_C_INLINE AC_C___ATTRIBUTE__ AC_PROG_CC_STDC +EINA_CPPFLAGS="" +case "$host_os" in + mingw32ce* | cegcc*) + EET_CPPFLAGS="-D_WIN32_WCE=0x0420" + ;; + mingw*) + EET_CPPFLAGS="-D_WIN32_WINNT=0x0500" + ;; +esac + EINA_CFLAGS="${EFL_COVERAGE_CFLAGS}" case "${host_os}" in cegcc*) @@ -305,6 +315,7 @@ if test "$GCC_MAJOR_VERSION" = "3" ; then EINA_CFLAGS="${EINA_CFLAGS} -fno-strict-aliasing" fi +AC_SUBST(EINA_CPPFLAGS) AC_SUBST(EINA_CFLAGS) diff --git a/legacy/eina/src/lib/Makefile.am b/legacy/eina/src/lib/Makefile.am index 5c6d366b74..9076b2054b 100644 --- a/legacy/eina/src/lib/Makefile.am +++ b/legacy/eina/src/lib/Makefile.am @@ -5,7 +5,8 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/include \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +@EINA_CPPFLAGS@ lib_LTLIBRARIES = libeina.la diff --git a/legacy/eina/src/modules/mp/chained_pool/Makefile.am b/legacy/eina/src/modules/mp/chained_pool/Makefile.am index 288deeee1a..c6ad9b447a 100644 --- a/legacy/eina/src/modules/mp/chained_pool/Makefile.am +++ b/legacy/eina/src/modules/mp/chained_pool/Makefile.am @@ -4,7 +4,9 @@ AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/include \ -I$(top_builddir)/src/include \ -@EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ +@EINA_CPPFLAGS@ \ +@EINA_CFLAGS@ \ +@EFL_PTHREAD_CFLAGS@ if EINA_BUILD_CHAINED_POOL if !EINA_STATIC_BUILD_CHAINED_POOL diff --git a/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am b/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am index a6b7ad39d9..9d264fda21 100644 --- a/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am +++ b/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am @@ -1,10 +1,10 @@ -MAINTAINERCLEANFILES = \ -Makefile.in +MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/include \ -I$(top_builddir)/src/include \ +@EINA_CPPFLAGS@ \ @EINA_CFLAGS@ \ @EMEMOA_CFLAGS@ diff --git a/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am b/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am index ace033a77a..d593d90a20 100644 --- a/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am +++ b/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am @@ -1,10 +1,10 @@ -MAINTAINERCLEANFILES = \ -Makefile.in +MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/include \ -I$(top_builddir)/src/include \ +@EINA_CPPFLAGS@ \ @EINA_CFLAGS@ \ @EMEMOA_CFLAGS@ diff --git a/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am b/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am index 89b606fa37..87b9397f35 100644 --- a/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am +++ b/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/include \ -I$(top_builddir)/src/include \ +@EINA_CPPFLAGS@ \ @EINA_CFLAGS@ if EINA_BUILD_FIXED_BITMAP diff --git a/legacy/eina/src/modules/mp/pass_through/Makefile.am b/legacy/eina/src/modules/mp/pass_through/Makefile.am index d1f9be1363..b630492255 100644 --- a/legacy/eina/src/modules/mp/pass_through/Makefile.am +++ b/legacy/eina/src/modules/mp/pass_through/Makefile.am @@ -1,10 +1,10 @@ -MAINTAINERCLEANFILES = \ -Makefile.in +MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/include \ -I$(top_builddir)/src/include \ +@EINA_CPPFLAGS@ \ @EINA_CFLAGS@ if EINA_BUILD_PASS_THROUGH