diff options
| author | Neil Moore <neil@s-z.org> | 2014-06-04 13:49:52 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-06-04 14:19:36 -0400 |
| commit | 97cf85e3ad4f3c109adc8a6e0f1ed4163876178b (patch) | |
| tree | e3901e8411cbc410d422977d519ebe34de3a8ee5 /crawl-ref/source/Makefile | |
| parent | 1be7c1f13a0b2c0ae7fba9230312ded6065a3b6f (diff) | |
| download | crawl-ref-97cf85e3ad4f3c109adc8a6e0f1ed4163876178b.tar.gz crawl-ref-97cf85e3ad4f3c109adc8a6e0f1ed4163876178b.zip | |
Allow using Luajit on 64-bit systems (#8641)
64-bit luajit doesn't support lua_newstate or custom allocators, so don't
try to use one there. However, give a warning if this happens with a
webtiles or dgamelaunch build, because servers probably do want the
memory throttling.
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index 17eed16f72..286110a5b4 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -622,6 +622,10 @@ ifndef BUILD_LUA LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs) endif +ifdef USE_LUAJIT +DEFINES_L += -DUSE_LUAJIT +endif + ifndef BUILD_SQLITE ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes) # INCLUDES_L += -isystem $(SQLITE_INCLUDE_DIR) |