From 631570cbd09d899c94aafb1602f693d74dc994fd Mon Sep 17 00:00:00 2001 From: jacob1 Date: Wed, 20 Sep 2017 20:42:10 -0400 Subject: [PATCH] mac luajit fix, version 92.5.336 --- SConscript | 2 ++ src/Config.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SConscript b/SConscript index c536619fd7..7b34bba8a0 100644 --- a/SConscript +++ b/SConscript @@ -416,6 +416,8 @@ elif platform == "Linux": elif platform == "Darwin": env.Append(CPPDEFINES=['MACOSX']) #env.Append(LINKFLAGS=['-headerpad_max_install_names']) #needed in some cross compiles + if GetOption('luajit'): + env.Append(LINKFLAGS=['-pagezero_size=10000, '-image_base=100000000'] #Add architecture flags and defines diff --git a/src/Config.h b/src/Config.h index 35e71af383..eef2d5765b 100644 --- a/src/Config.h +++ b/src/Config.h @@ -16,11 +16,11 @@ #endif #ifndef MINOR_VERSION -#define MINOR_VERSION 2 +#define MINOR_VERSION 5 #endif #ifndef BUILD_NUM -#define BUILD_NUM 333 +#define BUILD_NUM 336 #endif #ifndef SNAPSHOT_ID