mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-30 20:41:23 +00:00
Code Issues Releases Wiki Activity

get openmw building with LuaJIT on macos

Browse source
This commit is contained in:
Bret Curtis 2021-07-16 16:35:03 +02:00
parent 42e50e487a
commit 08a9abc46f
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CI/before_install.osx.sh
View file

@ -17,7 +17,7 @@ qmake --version
brew install lua 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 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
# additional libraries # additional libraries

1
CI/before_script.osx.sh
View file

@ -25,6 +25,5 @@ cmake \
-D BUILD_BSATOOL=TRUE \ -D BUILD_BSATOOL=TRUE \
-D BUILD_ESSIMPORTER=TRUE \ -D BUILD_ESSIMPORTER=TRUE \
-D BUILD_NIFTEST=TRUE \ -D BUILD_NIFTEST=TRUE \
-D USE_LUAJIT=FALSE \
-G"Unix Makefiles" \ -G"Unix Makefiles" \
.. ..

2
CMakeLists.txt
View file

@ -678,7 +678,7 @@ if (WIN32)
if (BUILD_OPENMW) if (BUILD_OPENMW)
# \bigobj is required: # \bigobj is required:
# 1) for OPENMW_UNITY_BUILD; # 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") set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj")
endif() endif()