Fix Elua compiling on OSX
Reviewers: cedric, raster, raoulh, q66 Reviewed By: q66 Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1231
This commit is contained in:
parent
56ce6d8e74
commit
afad5b75d0
|
@ -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_WINDOWS], [test "x${have_windows}" = "xyes"])
|
||||||
AM_CONDITIONAL([HAVE_PS3], [test "x${have_ps3}" = "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
|
#### Checks for programs
|
||||||
|
|
||||||
|
@ -3994,6 +3996,7 @@ if test "${want_lua_old}" = "yes"; then
|
||||||
else
|
else
|
||||||
EFL_DEPEND_PKG([EDJE], [LUAJIT], [luajit >= 2.0.0])
|
EFL_DEPEND_PKG([EDJE], [LUAJIT], [luajit >= 2.0.0])
|
||||||
EFL_DEPEND_PKG([EVAS], [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
|
fi
|
||||||
|
|
||||||
EFL_ADD_LIBS([EDJE], [-lm])
|
EFL_ADD_LIBS([EDJE], [-lm])
|
||||||
|
|
|
@ -13,6 +13,13 @@ bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
|
||||||
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
|
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
|
-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
|
if HAVE_WIN32
|
||||||
bin_elua_elua_LDADD = -L$(top_builddir)/src/lib/evil @ELUA_LIBS@
|
bin_elua_elua_LDADD = -L$(top_builddir)/src/lib/evil @ELUA_LIBS@
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue