From 08a9abc46f313e55d8e7c70dcb9fb6003798e2ed Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Fri, 16 Jul 2021 16:35:03 +0200 Subject: [PATCH] get openmw building with LuaJIT on macos --- CI/before_install.osx.sh | 2 +- CI/before_script.osx.sh | 1 - CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index d962e76086..d0b5b6a0aa 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -17,7 +17,7 @@ qmake --version brew install lua -curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210617.zip -o ~/openmw-deps.zip +curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210716.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null # additional libraries diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 27667c1c82..265e05b8ee 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -25,6 +25,5 @@ cmake \ -D BUILD_BSATOOL=TRUE \ -D BUILD_ESSIMPORTER=TRUE \ -D BUILD_NIFTEST=TRUE \ --D USE_LUAJIT=FALSE \ -G"Unix Makefiles" \ .. diff --git a/CMakeLists.txt b/CMakeLists.txt index f81af9e38b..b69cb5b71f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -678,7 +678,7 @@ if (WIN32) if (BUILD_OPENMW) # \bigobj is required: # 1) for OPENMW_UNITY_BUILD; - # 2) to compile lua binginds, because sol3 is heavily templated. + # 2) to compile lua bindings, because sol3 is heavily templated. set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj") endif()