From 3499efe014a5748bbe58d6c30278f0e6ab1752f2 Mon Sep 17 00:00:00 2001 From: Stan Date: Mon, 30 Dec 2024 23:41:57 +0100 Subject: [PATCH] Add two missed files in previous commit --- libraries/build-macos-libs.sh | 2 +- source/lib/external_libraries/openal.h | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libraries/build-macos-libs.sh b/libraries/build-macos-libs.sh index f54add377a..9c37254212 100755 --- a/libraries/build-macos-libs.sh +++ b/libraries/build-macos-libs.sh @@ -1111,7 +1111,7 @@ echo "Building OpenAL Soft" mkdir -p openal-soft cd openal-soft - if [ $force_rebuild = "true" ] || [ ! -e .already-built ] || [ "$(cat .already-built)" != "$OPENAL_SOFT_VERSION+1" ]; then + if [ $force_rebuild = "true" ] || [ ! -e .already-built ] || [ "$(cat .already-built)" != "$OPENAL_SOFT_VERSION" ]; then INSTALL_DIR="$(pwd)" rm -f .already-built diff --git a/source/lib/external_libraries/openal.h b/source/lib/external_libraries/openal.h index 0b662df214..714cd606df 100644 --- a/source/lib/external_libraries/openal.h +++ b/source/lib/external_libraries/openal.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 Wildfire Games. +/* Copyright (C) 2024 Wildfire Games. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -27,13 +27,8 @@ #ifndef INCLUDED_OPENAL #define INCLUDED_OPENAL -#if OS_MACOSX -# include -# include -#else -# include -# include -#endif +#include +#include // ALC strings (e.g. device and extension names) are typed differently // between OpenAL specifications