q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=afad5b75d07395f083fa5e03d223a4328ddaba92
commit afad5b75d07395f083fa5e03d223a4328ddaba92 Author: Jean Guyomarc'h <[email protected]> Date: Fri Jul 25 13:58:03 2014 +0100 Fix Elua compiling on OSX Reviewers: cedric, raster, raoulh, q66 Reviewed By: q66 Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1231 --- configure.ac | 3 +++ src/Makefile_Elua.am | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac index 5443e00..da1c7a9 100644 --- a/configure.ac +++ b/configure.ac @@ -221,6 +221,8 @@ AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"]) AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"]) AM_CONDITIONAL([HAVE_PS3], [test "x${have_ps3}" = "xyes"]) +AM_CONDITIONAL([HAVE_OSX], [test "x${have_darwin}" = "xyes"]) +AM_CONDITIONAL([HAVE_X86_64], [test "x${host_cpu}" = "xx86_64"]) #### Checks for programs @@ -3994,6 +3996,7 @@ if test "${want_lua_old}" = "yes"; then else EFL_DEPEND_PKG([EDJE], [LUAJIT], [luajit >= 2.0.0]) EFL_DEPEND_PKG([EVAS], [LUAJIT], [luajit >= 2.0.0]) + EFL_DEPEND_PKG([EVAS_CXX], [LUAJIT], [luajit >= 2.0.0]) fi EFL_ADD_LIBS([EDJE], [-lm]) diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am index 2b292d2..1c170e4 100644 --- a/src/Makefile_Elua.am +++ b/src/Makefile_Elua.am @@ -13,6 +13,13 @@ bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \ -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/elua\" + +if HAVE_OSX +if HAVE_X86_64 +bin_elua_elua_LDFLAGS = -pagezero_size 10000 -image_base 100000000 +endif +endif + if HAVE_WIN32 bin_elua_elua_LDADD = -L$(top_builddir)/src/lib/evil @ELUA_LIBS@ else --
