mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-01 02:41:24 +00:00
Code Issues Releases Wiki Activity

Merge branch 'macos_openal_soft' into 'master'

Browse source 
Ensure macos builds with openal-soft and not deprecated Apple Framework

See merge request OpenMW/openmw!3755
This commit is contained in:
psi29a 2024-01-10 08:20:31 +00:00
commit c9de6de29f
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CI/before_install.osx.sh
View file

@ -19,9 +19,8 @@ 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
export PATH="/opt/homebrew/opt/qt@5/bin:$PATH" export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
# Install deps # Install deps
brew install icu4c yaml-cpp sqlite brew install openal-soft icu4c yaml-cpp sqlite
ccache --version ccache --version
cmake --version cmake --version

3
CI/before_script.osx.sh
View file

@ -10,12 +10,13 @@ DEPENDENCIES_ROOT="/tmp/openmw-deps"
QT_PATH=$(brew --prefix qt@5) QT_PATH=$(brew --prefix qt@5)
ICU_PATH=$(brew --prefix icu4c) ICU_PATH=$(brew --prefix icu4c)
OPENAL_PATH=$(brew --prefix openal-soft)
CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache
mkdir build mkdir build
cd build cd build
cmake \ cmake \
-D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \ -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH;$OPENAL_PATH" \
-D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \ -D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
-D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \ -D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE" \
-D CMAKE_CXX_FLAGS="-stdlib=libc++" \ -D CMAKE_CXX_FLAGS="-stdlib=libc++" \

1
CMakeLists.txt
View file

@ -54,6 +54,7 @@ IF(NOT CMAKE_BUILD_TYPE)
ENDIF() ENDIF()
if (APPLE) if (APPLE)
set(CMAKE_FIND_FRAMEWORK LAST) # prefer dylibs over frameworks
set(APP_BUNDLE_NAME "${CMAKE_PROJECT_NAME}.app") set(APP_BUNDLE_NAME "${CMAKE_PROJECT_NAME}.app")
set(APP_BUNDLE_DIR "${OpenMW_BINARY_DIR}/${APP_BUNDLE_NAME}") set(APP_BUNDLE_DIR "${OpenMW_BINARY_DIR}/${APP_BUNDLE_NAME}")