mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 21:11:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'macos_luajit' into 'master'

Browse source 
get openmw building with LuaJIT on macos

Closes #5990

See merge request OpenMW/openmw!1021
This commit is contained in:
psi29a 2021-07-17 09:30:41 +00:00
commit d30f0f11b4
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CI/before_install.osx.sh
View file

@ -1,11 +1,15 @@
#!/bin/sh -ex #!/bin/sh -ex
export HOMEBREW_NO_EMOJI=1
brew update --quiet
# workaround python issue on travis # workaround python issue on travis
[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true [ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies python@3.8 || true
[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true [ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies python@3.9 || true
[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true [ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true
# Some of these tools can come from places other than brew, so check before installing # Some of these tools can come from places other than brew, so check before installing
[ -z "${TRAVIS}" ] && brew install fontconfig
command -v ccache >/dev/null 2>&1 || brew install ccache command -v ccache >/dev/null 2>&1 || brew install ccache
command -v cmake >/dev/null 2>&1 || brew install cmake command -v cmake >/dev/null 2>&1 || brew install cmake
command -v qmake >/dev/null 2>&1 || brew install qt@5 command -v qmake >/dev/null 2>&1 || brew install qt@5
@ -15,10 +19,6 @@ ccache --version
cmake --version cmake --version
qmake --version qmake --version
brew install lua curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210716.zip -o ~/openmw-deps.zip
curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210617.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
[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig

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()