Skip to content

Commit

Permalink
Updated libOpenMPT to version 0.7.9
Browse files Browse the repository at this point in the history 
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
  • Loading branch information
@kode54
kode54 committed Aug 17, 2024
1 parent 03b5268 commit d3415a3
Show file tree
Hide file tree
Showing 137 changed files with 2,230 additions and 1,269 deletions.
2 changes: 1 addition & 1 deletion Frameworks/OpenMPT/OpenMPT/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2004-2023, OpenMPT Project Developers and Contributors
Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors
Copyright (c) 1997-2003, Olivier Lapicque
All rights reserved.

Expand Down
55 changes: 20 additions & 35 deletions Frameworks/OpenMPT/OpenMPT/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,32 +585,10 @@ endif

endif

ifeq ($(OPTIMIZE_FASTMATH),2)
CPPFLAGS += -DMPT_CHECK_CXX_IGNORE_WARNING_FASTMATH -DMPT_CHECK_CXX_IGNORE_WARNING_FINITEMATH
CXXFLAGS += -ffast-math
CFLAGS += -ffast-math
else ifeq ($(OPTIMIZE_FASTMATH),1)
CPPFLAGS += -DMPT_CHECK_CXX_IGNORE_WARNING_FINITEMATH
CXXFLAGS += -fassociative-math
CXXFLAGS += -fcx-limited-range
CXXFLAGS += -fexcess-precision=fast
CXXFLAGS += -ffinite-math-only
CXXFLAGS += -freciprocal-math
CXXFLAGS += -fno-math-errno
CXXFLAGS += -fno-rounding-math
CXXFLAGS += -fno-signaling-nans
CXXFLAGS += -fno-signed-zeros
CXXFLAGS += -fno-trapping-math
CFLAGS += -fassociative-math
CFLAGS += -fcx-limited-range
CFLAGS += -fexcess-precision=fast
CFLAGS += -ffinite-math-only
CFLAGS += -freciprocal-math
CFLAGS += -fno-math-errno
CFLAGS += -fno-rounding-math
CFLAGS += -fno-signaling-nans
CFLAGS += -fno-signed-zeros
CFLAGS += -fno-trapping-math
ifeq ($(MPT_COMPILER_NOIPARA),1)
# See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049>.
CXXFLAGS += -fno-ipa-ra
CFLAGS += -fno-ipa-ra
endif

ifeq ($(CHECKED),1)
Expand Down Expand Up @@ -707,10 +685,10 @@ endif
endif

ifeq ($(LOCAL_MPG123),1)
CPPFLAGS_MPG123 := -DMPT_WITH_MPG123
CPPFLAGS_MPG123 := -DMPT_WITH_MPG123 -DMPG123_NO_LARGENAME
LDFLAGS_MPG123 :=
LDLIBS_MPG123 :=
CPPFLAGS_MPG123 += -Iinclude/mpg123/src/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/
CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/
LOCAL_MPG123_SOURCES :=
LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat.c
LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat_str.c
Expand All @@ -726,6 +704,7 @@ LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/index.c
LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer1.c
LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer2.c
LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/layer3.c
LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/lfs_wrap.c
LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/libmpg123.c
LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/ntom.c
LOCAL_MPG123_SOURCES += include/mpg123/src/libmpg123/optimize.c
Expand All @@ -741,6 +720,10 @@ include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENER
include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
else
ifeq ($(NO_MPG123),1)
else
Expand Down Expand Up @@ -795,7 +778,10 @@ ifeq ($(LOCAL_VORBIS),1)
CPPFLAGS_VORBIS := -DMPT_WITH_VORBIS
LDFLAGS_VORBIS :=
LDLIBS_VORBIS :=
CPPFLAGS_VORBIS += -Iinclude/vorbis/include/ -Iinclude/vorbis/lib/ -DHAVE_ALLOCA_H
CPPFLAGS_VORBIS += -Iinclude/vorbis/include/ -Iinclude/vorbis/lib/
ifneq ($(MPT_COMPILER_NOALLOCAH),1)
CPPFLAGS_VORBIS += -DHAVE_ALLOCA_H
endif
LOCAL_VORBIS_SOURCES :=
LOCAL_VORBIS_SOURCES += include/vorbis/lib/analysis.c
LOCAL_VORBIS_SOURCES += include/vorbis/lib/bitrate.c
Expand Down Expand Up @@ -991,6 +977,7 @@ CPPCHECK_FLAGS += -j $(NUMTHREADS)
CPPCHECK_FLAGS += --std=c11 --std=c++17
CPPCHECK_FLAGS += --quiet
CPPCHECK_FLAGS += --enable=warning --inline-suppr --template='{file}:{line}: warning: {severity}: {message} [{id}]'
CPPCHECK_FLAGS += --check-level=exhaustive
CPPCHECK_FLAGS += --suppress=missingIncludeSystem
CPPCHECK_FLAGS += --suppress=uninitMemberVar

Expand Down Expand Up @@ -1849,15 +1836,13 @@ bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION).dev.js.tar:
mkdir -p bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin
mkdir -p bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all
cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.js bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.js
cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.js.mem bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.js.mem
cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.wasm bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.wasm
cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.wasm.js bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.wasm.js
mkdir -p bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm
cp bin/$(FLAVOUR_DIR)stage/wasm/libopenmpt.js bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm/libopenmpt.js
cp bin/$(FLAVOUR_DIR)stage/wasm/libopenmpt.wasm bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm/libopenmpt.wasm
mkdir -p bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js
cp bin/$(FLAVOUR_DIR)stage/js/libopenmpt.js bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js/libopenmpt.js
cp bin/$(FLAVOUR_DIR)stage/js/libopenmpt.js.mem bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js/libopenmpt.js.mem
cd bin/$(FLAVOUR_DIR)dist-js/ && tar cv --numeric-owner --owner=0 --group=0 libopenmpt-$(DIST_LIBOPENMPT_VERSION) > libopenmpt-$(DIST_LIBOPENMPT_VERSION).dev.js.tar

.PHONY: bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION).bin.dos.zip
Expand Down Expand Up @@ -2005,10 +1990,10 @@ ifeq ($(SHARED_LIB),1)
endif
endif

contrib/fuzzing/fuzz$(FLAVOUR_O).o: contrib/fuzzing/fuzz.c
$(INFO) [CC] $<
$(VERYSILENT)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*$(FLAVOUR_O).d
$(SILENT)$(COMPILE.c) $(OUTPUT_OPTION) $<
contrib/fuzzing/fuzz$(FLAVOUR_O).o: contrib/fuzzing/fuzz.cpp
$(INFO) [CXX] $<
$(VERYSILENT)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -M -MT$@ $< > $*$(FLAVOUR_O).d
$(SILENT)$(COMPILE.cc) $(OUTPUT_OPTION) $<
bin/$(FLAVOUR_DIR)fuzz$(EXESUFFIX): contrib/fuzzing/fuzz$(FLAVOUR_O).o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
$(INFO) [LD] $@
$(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) contrib/fuzzing/fuzz$(FLAVOUR_O).o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) -o $@
Expand Down
5 changes: 3 additions & 2 deletions Frameworks/OpenMPT/OpenMPT/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ How to compile

- Visual Studio 2017 XP targeting toolset

- OpenMPT requires the compile host system to be Windows 8.1 (or later) amd64,
or Windows 11 (or later) ARM64.
- OpenMPT requires the compile host system to be Windows 8.1 (or later) on
amd64 for VS2019 and VS2017, Windows 10 (or later) on amd64 for VS2022, or
Windows 11 (or later) ARM64.

- In order to build OpenMPT for Windows XP, the Visual Studio 2017 XP
targeting toolset as well as the Windows 8.1 SDK need to be installed. The
Expand Down
2 changes: 2 additions & 0 deletions Frameworks/OpenMPT/OpenMPT/build/android_ndk/Application.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ APP_CFLAGS := -std=c17
APP_CPPFLAGS := -std=c++17 -fexceptions -frtti
APP_LDFLAGS :=
APP_STL := c++_shared

APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
6 changes: 3 additions & 3 deletions Frameworks/OpenMPT/OpenMPT/build/dist.mk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

MPT_SVNVERSION=19406
MPT_SVNURL=https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.7.2
MPT_SVNDATE=2023-06-18T13:08:13.199805Z
MPT_SVNVERSION=21223
MPT_SVNURL=https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.7.9
MPT_SVNDATE=2024-07-21T12:01:13.335584Z
160 changes: 75 additions & 85 deletions Frameworks/OpenMPT/OpenMPT/build/download_externals.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,96 +7,83 @@ set -e
cd build 2>&1 > /dev/null || true
cd ..

function download_and_unpack_tar () {
function download () {
set -e
MPT_GET_DESTDIR="$1"
MPT_GET_URL="$2"
MPT_GET_FILE="$3"
MPT_GET_SUBDIR="$4"
if [ ! -f "$3" ]; then
wget "$2" -O "$3"
fi
cd include
if [ -d "$1" ]; then
rm -rf "$1"
MPT_GET_FILE_NAME="$1"
MPT_GET_FILE_SIZE="$2"
MPT_GET_FILE_CHECKSUM="$3"
MPT_GET_URLS="$4"
echo "Checking '$MPT_GET_FILE_NAME' ..."
if [ -f "$MPT_GET_FILE_NAME" ]; then
FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s')
if [ ! "x$FILE_SIZE" = "x$MPT_GET_FILE_SIZE" ]; then
echo "$FILE_SIZE does not match expected file size $MPT_GET_FILE_SIZE. Redownloading."
rm -f "$MPT_GET_FILE_NAME"
fi
if [ "$4" = "." ]; then
mkdir "$1"
cd "$1"
tar xvaf "../../$3"
cd ..
else
tar xvaf "../$3"
if [ ! "$4" = "$1" ]; then
mv "$4" "$1"
fi
fi
cd ..
return 0
}

function download_and_unpack_zip () {
set -e
MPT_GET_DESTDIR="$1"
MPT_GET_URL="$2"
MPT_GET_FILE="$3"
MPT_GET_SUBDIR="$4"
if [ ! -f "$3" ]; then
wget "$2" -O "$3"
fi
cd include
if [ -d "$1" ]; then
rm -rf "$1"
fi
if [ "$4" = "." ]; then
mkdir "$1"
cd "$1"
unzip "../../$3"
cd ..
else
unzip "../$3"
if [ ! "$4" = "$1" ]; then
mv "$4" "$1"
fi
if [ -f "$MPT_GET_FILE_NAME" ]; then
FILE_CHECKSUM=$(sha512sum "$MPT_GET_FILE_NAME" | awk '{print $1;}')
if [ ! "x$FILE_CHECKSUM" = "x$MPT_GET_FILE_CHECKSUM" ]; then
echo "$FILE_CHECKSUM does not match expected file checksum $MPT_GET_FILE_CHECKSUM. Redownloading."
rm -f "$MPT_GET_FILE_NAME"
fi
cd ..
return 0
}

function download_and_unpack_7z () {
set -e
MPT_GET_DESTDIR="$1"
MPT_GET_URL="$2"
MPT_GET_FILE="$3"
MPT_GET_SUBDIR="$4"
if [ ! -f "$3" ]; then
wget "$2" -O "$3"
fi
cd include
if [ -d "$1" ]; then
rm -rf "$1"
fi
if [ "$4" = "." ]; then
mkdir "$1"
cd "$1"
7z x "../../$3"
cd ..
else
7z x "../$3"
if [ ! "$4" = "$1" ]; then
mv "$4" "$1"
for URL in $MPT_GET_URLS; do
if [ ! -f "$MPT_GET_FILE_NAME" ]; then
echo "Downloading '$MPT_GET_FILE_NAME' from '$URL' ..."
curl -o "$MPT_GET_FILE_NAME" "$URL"
echo "Verifying '$URL' ..."
if [ -f "$MPT_GET_FILE_NAME" ]; then
FILE_SIZE=$(find "$MPT_GET_FILE_NAME" -printf '%s')
if [ ! "x$FILE_SIZE" = "x$MPT_GET_FILE_SIZE" ]; then
echo "$FILE_SIZE does not match expected file size $MPT_GET_FILE_SIZE."
rm -f "$MPT_GET_FILE_NAME"
fi
fi
if [ -f "$MPT_GET_FILE_NAME" ]; then
FILE_CHECKSUM=$(sha512sum "$MPT_GET_FILE_NAME" | awk '{print $1;}')
if [ ! "x$FILE_CHECKSUM" = "x$MPT_GET_FILE_CHECKSUM" ]; then
echo "$FILE_CHECKSUM does not match expected file checksum $MPT_GET_FILE_CHECKSUM."
rm -f "$MPT_GET_FILE_NAME"
fi
fi
fi
cd ..
done
if [ ! -f "$MPT_GET_FILE_NAME" ]; then
echo "Failed to download '$MPT_GET_FILE_NAME'."
return 1
fi
return 0
}

function download () {
function unpack () {
set -e
MPT_GET_URL="$1"
MPT_GET_DESTDIR="$1"
MPT_GET_FILE="$2"
if [ ! -f "$2" ]; then
wget "$1" -O "$2"
MPT_GET_SUBDIR="$3"
echo "Extracting '$MPT_GET_DESTDIR' from '$MPT_GET_FILE:$MPT_GET_SUBDIR' ..."
EXTENSION="${MPT_GET_FILE##*.}"
if [ -d "$MPT_GET_DESTDIR" ]; then
rm -rf "$MPT_GET_DESTDIR"
fi
mkdir "$MPT_GET_DESTDIR"
case "$EXTENSION" in
tar)
tar -xvaf "$MPT_GET_FILE" -C "$MPT_GET_DESTDIR"
;;
zip)
unzip -d "$MPT_GET_DESTDIR" "$MPT_GET_FILE"
;;
7z)
7z x -o"$MPT_GET_DESTDIR" "$MPT_GET_FILE"
;;
exe)
7z x -o"$MPT_GET_DESTDIR" "$MPT_GET_FILE"
;;
esac
if [ ! "$MPT_GET_SUBDIR" = "." ]; then
mv "$MPT_GET_DESTDIR" "$MPT_GET_DESTDIR.tmp"
mv "$MPT_GET_DESTDIR.tmp/$MPT_GET_SUBDIR" "$MPT_GET_DESTDIR"
fi
return 0
}
Expand All @@ -108,13 +95,16 @@ if [ ! -d "build/tools" ]; then
mkdir build/tools
fi

download "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip"
download "build/externals/csdpmi7b.zip" 71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip"
download "build/externals/csdpmi7s.zip" 89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip"
download "build/externals/WA5.55_SDK.exe" 336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe"
download "build/externals/xmp-sdk.zip" 322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip"

unpack "include/allegro42" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "."
unpack "include/cwsdpmi" "build/externals/csdpmi7b.zip" "."
unpack "include/winamp" "build/externals/WA5.55_SDK.exe" "."
unpack "include/xmplay" "build/externals/xmp-sdk.zip" "."

download_and_unpack_zip "allegro42" "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "."
download_and_unpack_zip "cwsdpmi" "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "build/externals/csdpmi7b.zip" "."
download "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip" "build/externals/csdpmi7s.zip"
#download_and_unpack_zip "cwsdpmi" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip" "build/externals/csdpmi7b.zip" "."
#download "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip" "build/externals/csdpmi7s.zip"
download_and_unpack_7z "winamp" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build/externals/WA5.55_SDK.exe" "."
ln -s OUT.H include/winamp/Winamp/out.h
download_and_unpack_zip "xmplay" "https://www.un4seen.com/files/xmp-sdk.zip" "build/externals/xmp-sdk.zip" "."

11 changes: 4 additions & 7 deletions Frameworks/OpenMPT/OpenMPT/build/make/config-defaults.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ ifeq ($(HOST),unix)

ifeq ($(HOST_FLAVOUR),MACOSX)

NO_PULSEAUDIO?=1
include build/make/config-clang.mk
# Mac OS X overrides
DYNLINK=0
SHARED_SONAME=0
MPT_COMPILER_NOSECTIONS=1
MPT_COMPILER_NOGCSECTIONS=1
include build/make/config-macos.mk

else ifeq ($(HOST_FLAVOUR),MSYS2)

Expand Down Expand Up @@ -38,18 +32,21 @@ include build/make/config-gcc.mk
else ifeq ($(HOST_FLAVOUR),NETBSD)

include build/make/config-gcc.mk
MPT_COMPILER_NOALLOCAH=1
NO_PORTAUDIOCPP?=1

else ifeq ($(HOST_FLAVOUR),FREEBSD)

include build/make/config-clang.mk
MPT_COMPILER_NOALLOCAH=1
NO_PORTAUDIOCPP?=1

else ifeq ($(HOST_FLAVOUR),OPENBSD)

NO_PORTAUDIOCPP?=1
NO_PULSEAUDIO?=1
include build/make/config-clang.mk
MPT_COMPILER_NOALLOCAH=1

else ifeq ($(HOST_FLAVOUR),HAIKU)

Expand Down
Loading

0 comments on commit d3415a3

Please sign in to comment.