forked from enlightenment/efl
merge: pass directly to the preprocessor the Windows macro instead of using autotools
SVN revision: 78350
This commit is contained in:
parent
4aae3528c0
commit
77d90bd45e
14
configure.ac
14
configure.ac
|
@ -396,14 +396,11 @@ AC_DEFINE_IF([EINA_STRINGSHARE_USAGE],
|
||||||
|
|
||||||
# Evil library for compilation on Windows
|
# Evil library for compilation on Windows
|
||||||
|
|
||||||
EFL_EINA_BUILD=""
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw*)
|
mingw*)
|
||||||
requirements_pc_eina="${requirements_pc_eina} evil"
|
requirements_pc_eina="${requirements_pc_eina} evil"
|
||||||
EFL_EINA_BUILD="-DEFL_EINA_BUILD"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
AC_SUBST([EFL_EINA_BUILD])
|
|
||||||
|
|
||||||
# Escape library for compilation on Playstation 3
|
# Escape library for compilation on Playstation 3
|
||||||
|
|
||||||
|
@ -572,14 +569,11 @@ esac
|
||||||
|
|
||||||
# Evil library for compilation on Windows
|
# Evil library for compilation on Windows
|
||||||
|
|
||||||
EFL_EET_BUILD=""
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw*)
|
mingw*)
|
||||||
requirements_pc_eet="evil ${requirements_pc_eet}"
|
requirements_pc_eet="evil ${requirements_pc_eet}"
|
||||||
EFL_EET_BUILD="-DEFL_EET_BUILD"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
AC_SUBST(EFL_EET_BUILD)
|
|
||||||
|
|
||||||
## Secure layer
|
## Secure layer
|
||||||
|
|
||||||
|
@ -740,14 +734,6 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
|
||||||
|
|
||||||
### Checks for compiler characteristics
|
### Checks for compiler characteristics
|
||||||
|
|
||||||
EFL_EO_BUILD=""
|
|
||||||
case "$host_os" in
|
|
||||||
mingw*)
|
|
||||||
EFL_EO_BUILD="-DEFL_EO_BUILD"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
AC_SUBST([EFL_EO_BUILD])
|
|
||||||
|
|
||||||
### Checks for linker characteristics
|
### Checks for linker characteristics
|
||||||
|
|
||||||
### Checks for library functions
|
### Checks for library functions
|
||||||
|
|
|
@ -6,7 +6,6 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/lib/eo \
|
-I$(top_srcdir)/src/lib/eo \
|
||||||
-I$(top_builddir)/src/lib/eina \
|
-I$(top_builddir)/src/lib/eina \
|
||||||
-I$(top_builddir)/src/lib/eo \
|
-I$(top_builddir)/src/lib/eo \
|
||||||
@EFL_EO_BUILD@ \
|
|
||||||
@EO_CFLAGS@
|
@EO_CFLAGS@
|
||||||
|
|
||||||
EXTRA_PROGRAMS = eo_bench
|
EXTRA_PROGRAMS = eo_bench
|
||||||
|
|
|
@ -6,7 +6,6 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/lib/eo \
|
-I$(top_srcdir)/src/lib/eo \
|
||||||
-I$(top_builddir)/src/lib/eina \
|
-I$(top_builddir)/src/lib/eina \
|
||||||
-I$(top_builddir)/src/lib/eo \
|
-I$(top_builddir)/src/lib/eo \
|
||||||
@EFL_EO_BUILD@ \
|
|
||||||
@EO_CFLAGS@
|
@EO_CFLAGS@
|
||||||
|
|
||||||
EXTRA_PROGRAMS = eo_isa eo_simple
|
EXTRA_PROGRAMS = eo_isa eo_simple
|
||||||
|
|
|
@ -10,8 +10,8 @@ AM_CPPFLAGS = \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
|
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
|
||||||
@EET_CFLAGS@ \
|
-DEFL_EET_BUILD \
|
||||||
@EFL_EET_BUILD@
|
@EET_CFLAGS@
|
||||||
|
|
||||||
if HAVE_WINDOWS
|
if HAVE_WINDOWS
|
||||||
AM_CPPFLAGS += \
|
AM_CPPFLAGS += \
|
||||||
|
|
|
@ -6,7 +6,7 @@ AM_CPPFLAGS = \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||||
@EFL_EINA_BUILD@ \
|
-DEFL_EINA_BUILD \
|
||||||
@EFL_PTHREAD_CFLAGS@ \
|
@EFL_PTHREAD_CFLAGS@ \
|
||||||
@EINA_CFLAGS@ \
|
@EINA_CFLAGS@ \
|
||||||
@VALGRIND_CFLAGS@
|
@VALGRIND_CFLAGS@
|
||||||
|
|
|
@ -6,7 +6,7 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_builddir)/src/lib/eina \
|
-I$(top_builddir)/src/lib/eina \
|
||||||
-I$(top_builddir)/src/lib/eo \
|
-I$(top_builddir)/src/lib/eo \
|
||||||
-DNDEBUG \
|
-DNDEBUG \
|
||||||
@EFL_EO_BUILD@ \
|
-DEFL_EO_BUILD \
|
||||||
@EO_CFLAGS@
|
@EO_CFLAGS@
|
||||||
|
|
||||||
if HAVE_WINDOWS
|
if HAVE_WINDOWS
|
||||||
|
|
|
@ -4,7 +4,7 @@ AM_CPPFLAGS = \
|
||||||
-I. \
|
-I. \
|
||||||
-I$(top_srcdir)/src/lib/eina \
|
-I$(top_srcdir)/src/lib/eina \
|
||||||
-I$(top_builddir)/src/lib/eina \
|
-I$(top_builddir)/src/lib/eina \
|
||||||
@EFL_EINA_BUILD@ \
|
-DEFL_EINA_BUILD \
|
||||||
@VALGRIND_CFLAGS@
|
@VALGRIND_CFLAGS@
|
||||||
|
|
||||||
controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
|
controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
|
||||||
|
|
|
@ -4,7 +4,7 @@ AM_CPPFLAGS = \
|
||||||
-I. \
|
-I. \
|
||||||
-I$(top_srcdir)/src/lib/eina \
|
-I$(top_srcdir)/src/lib/eina \
|
||||||
-I$(top_builddir)/src/lib/eina \
|
-I$(top_builddir)/src/lib/eina \
|
||||||
@EFL_EINA_BUILD@ \
|
-DEFL_EINA_BUILD \
|
||||||
@VALGRIND_CFLAGS@
|
@VALGRIND_CFLAGS@
|
||||||
|
|
||||||
controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
|
controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
|
||||||
|
|
|
@ -4,7 +4,7 @@ AM_CPPFLAGS = \
|
||||||
-I. \
|
-I. \
|
||||||
-I$(top_srcdir)/src/lib/eina \
|
-I$(top_srcdir)/src/lib/eina \
|
||||||
-I$(top_builddir)/src/lib/eina \
|
-I$(top_builddir)/src/lib/eina \
|
||||||
@EFL_EINA_BUILD@
|
-DEFL_EINA_BUILD
|
||||||
|
|
||||||
controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH)
|
controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH)
|
||||||
controller_LTLIBRARIES = module.la
|
controller_LTLIBRARIES = module.la
|
||||||
|
|
|
@ -62,7 +62,7 @@ check-local: module_dummy.la
|
||||||
|
|
||||||
module_dummy_la_SOURCES = eina_test_module_dummy.c
|
module_dummy_la_SOURCES = eina_test_module_dummy.c
|
||||||
|
|
||||||
module_dummy_la_CPPFLAGS = $(AM_CPPFLAGS) @EFL_EINA_BUILD@
|
module_dummy_la_CPPFLAGS = $(AM_CPPFLAGS) -DEFL_EINA_BUILD
|
||||||
module_dummy_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
|
module_dummy_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
|
||||||
module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
|
module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
|
||||||
module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
|
module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
|
@ -5,7 +5,6 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/lib/eo \
|
-I$(top_srcdir)/src/lib/eo \
|
||||||
-I$(top_builddir)/src/lib/eina \
|
-I$(top_builddir)/src/lib/eina \
|
||||||
-I$(top_builddir)/src/lib/eo \
|
-I$(top_builddir)/src/lib/eo \
|
||||||
@EFL_EO_BUILD@ \
|
|
||||||
@EO_CFLAGS@ \
|
@EO_CFLAGS@ \
|
||||||
@CHECK_CFLAGS@
|
@CHECK_CFLAGS@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue