From f55a07dd80982529edf6bb878caab24f3cab3e68 Mon Sep 17 00:00:00 2001 From: Leonardo Laguna Ruiz Date: Sat, 25 Feb 2023 12:24:58 +0200 Subject: [PATCH] Fixes LuaJIT engine on Mac OS. In order to make LuaJIT work on Mac it is necessary to update to LuaJIT 2.1. --- Makefile | 20 ++++++++++++++------ src/LuaJITEngine.cpp | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c80e398..af8cc9d 100644 --- a/Makefile +++ b/Makefile @@ -29,11 +29,20 @@ endif # Entropia File System Watcher +ifeq (, $(shell which premake4)) + ifeq (, $(shell which premake5)) + $(error premake is not installed. Please install either premake4 or premake5) + else + PREMAKE = premake5 + endif +else + PREMAKE = premake4 +endif efsw := dep/lib/libefsw-static-release.a DEPS += $(efsw) OBJECTS += $(efsw) $(efsw): - cd efsw && premake4 gmake + cd efsw && $(PREMAKE) gmake cd efsw && $(MAKE) -C make/* config=release efsw-static-lib mkdir -p dep/lib dep/include cd efsw && cp lib/libefsw-static-release.a $(DEP_PATH)/lib/ @@ -74,14 +83,13 @@ endif # LuaJIT ifeq ($(LUAJIT), 1) SOURCES += src/LuaJITEngine.cpp -luajit := dep/lib/libluajit-5.1.a +luajit := dep/LuaJIT/src/libluajit.a OBJECTS += $(luajit) DEPS += $(luajit) $(luajit): - $(WGET) "http://luajit.org/download/LuaJIT-2.0.5.tar.gz" - $(SHA256) LuaJIT-2.0.5.tar.gz 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979 - cd dep && $(UNTAR) ../LuaJIT-2.0.5.tar.gz - cd dep/LuaJIT-2.0.5 && $(MAKE) BUILDMODE=static PREFIX="$(DEP_PATH)" install + cd dep && git clone "https://github.com/LuaJIT/LuaJIT.git" + cd dep/LuaJIT && git checkout v2.1 + cd dep/LuaJIT && MACOSX_DEPLOYMENT_TARGET=10.9 $(MAKE) BUILDMODE=static PREFIX="$(DEP_PATH)" install endif diff --git a/src/LuaJITEngine.cpp b/src/LuaJITEngine.cpp index a2167a6..df1fb59 100644 --- a/src/LuaJITEngine.cpp +++ b/src/LuaJITEngine.cpp @@ -1,5 +1,5 @@ #include "ScriptEngine.hpp" -#include +#include struct LuaJITEngine : ScriptEngine {