Merge branch 'OpenMPT:master' into master

.github/workflows/FreeBSD-12.4-Makefile.yml

@@ -17,12 +17,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: cross-platform-actions/action@v0.18.0
+    - uses: cross-platform-actions/action@d5b757fcb7b645a0a5057b572aab822f8ccd7de7
       with:
         architecture: x86_64
         hypervisor: xhyve
+        memory: 4G
         operating_system: freebsd
         version: '12.4'
+        sync_files: runner-to-vm
         shell: bash
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2

.github/workflows/FreeBSD-13.2-Makefile.yml

@@ -17,12 +17,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: cross-platform-actions/action@v0.18.0
+    - uses: cross-platform-actions/action@d5b757fcb7b645a0a5057b572aab822f8ccd7de7
       with:
         architecture: x86_64
         hypervisor: xhyve
+        memory: 4G
         operating_system: freebsd
         version: '13.2'
+        sync_files: runner-to-vm
         shell: bash
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2

.github/workflows/NetBSD-9.3-Makefile.yml

@@ -17,12 +17,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: cross-platform-actions/action@v0.18.0
+    - uses: cross-platform-actions/action@v0.21.1
       with:
         architecture: x86_64
         hypervisor: qemu
+        memory: 4G
         operating_system: netbsd
         version: '9.3'
+        sync_files: runner-to-vm
         shell: bash
         run: |
           sudo pkgin -y install subversion git p5-XML-XPath mawk

.github/workflows/OpenBSD-7.3-Makefile.yml → .github/workflows/OpenBSD-7.4-Makefile.yml

@@ -1,4 +1,4 @@
-name: OpenBSD 7.3 Makefile
+name: OpenBSD 7.4 Makefile
 
 on:
   push:
@@ -17,12 +17,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: cross-platform-actions/action@v0.18.0
+    - uses: cross-platform-actions/action@v0.21.1
       with:
         architecture: x86_64
         hypervisor: xhyve
+        memory: 4G
         operating_system: openbsd
-        version: '7.3'
+        version: '7.4'
+        sync_files: runner-to-vm
         shell: bash
         run: |
           sudo pkg_add subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2

.github/workflows/macOS-12-Makefile.yml

@@ -0,0 +1,31 @@
+name: macOS 12 Makefile
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+
+    runs-on: macos-12
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: fixup GitHub Homebrew node breakage
+      run: brew unlink node@18 && brew unlink node && brew link --overwrite node
+    - name: fixup GitHub Homebrew python breakage
+      run: brew unlink python@3.11 && brew link --overwrite python@3.11
+    - name: install dependencies
+      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+    - name: setup parallel make
+      run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
+    - name: make
+      run: make STRICT=1 FORCE_DEPS=1
+    - name: make check
+      run: make STRICT=1 FORCE_DEPS=1 check

.github/workflows/macOS-13-Makefile.yml

@@ -0,0 +1,29 @@
+name: macOS 13 Makefile
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+
+    runs-on: macos-13
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: fixup GitHub Homebrew python breakage
+      run: brew unlink python@3.11 && brew link --overwrite python@3.11
+    - name: install dependencies
+      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+    - name: setup parallel make
+      run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
+    - name: make
+      run: make STRICT=1 FORCE_DEPS=1
+    - name: make check
+      run: make STRICT=1 FORCE_DEPS=1 check

.gitignore

@@ -383,6 +383,7 @@
 /include/mpg123/mpg123.spec
 /include/mpg123/mpg123.spec.in
 /include/mpg123/scripts
+/include/mpg123/test_c99.c
 /include/mpg123/windows-builds.sh
 /include/mpg123/ports/README
 /include/mpg123/ports/Sony_PSP

Makefile

@@ -707,8 +707,75 @@ endif
 endif
 
 ifeq ($(LOCAL_MPG123),1)
-CPPFLAGS_MPG123 := -DMPT_WITH_MPG123
+
+ifeq ($(ENABLE_DXE),1)
+
+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/
+MPG123_SOURCES := 
+MPG123_SOURCES += include/mpg123/src/compat/compat.c
+MPG123_SOURCES += include/mpg123/src/compat/compat_str.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/dct64.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/equalizer.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/feature.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/format.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/frame.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/icy.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/icy2utf8.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/id3.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/index.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/layer1.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/layer2.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/layer3.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/lfs_wrap.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/libmpg123.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/ntom.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/optimize.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/parse.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/readers.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/stringbuf.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/synth.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/synth_8bit.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/synth_real.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/synth_s32.c
+MPG123_SOURCES += include/mpg123/src/libmpg123/tabinit.c
+MPG123_OBJECTS += $(MPG123_SOURCES:.c=$(FLAVOUR_O).o)
+MPG123_DEPENDS = $(MPG123_OBJECTS:$(FLAVOUR_O).o=$(FLAVOUR_O).d)
+ALL_OBJECTS += $(MPG123_OBJECTS)
+ALL_DEPENDS += $(MPG123_DEPENDS)
+include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
+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/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+LOCAL_MPG123_SOURCES :=
+LOCAL_MPG123_SOURCES +=
+LOCAL_MPG123_OBJECTS :=
+LOCAL_MPG123_OBJECTS +=
+LOCAL_MPG123_LIBS :=
+LOCAL_MPG123_LIBS += bin/$(FLAVOUR_DIR)mpg123.a
+
+bin/$(FLAVOUR_DIR)mpg123.a: $(MPG123_OBJECTS)
+	$(INFO) [DXE] $@
+ifeq ($(NO_SHARED_LINKER_FLAG),1)
+	$(SILENT)PATH="./build/djgpp/bin:${PATH}" $(DXE3GEN) -o bin/$(FLAVOUR_DIR)mpg123$(SOSUFFIX) -Y $@ -U $^ $(MPG123_LDFLAGS) $(SO_LDFLAGS)
+else
+	$(SILENT)PATH="./build/djgpp/bin:${PATH}" $(DXE3GEN) -o bin/$(FLAVOUR_DIR)mpg123$(SOSUFFIX) -Y $@ -U $^ -shared $(MPG123_LDFLAGS) $(SO_LDFLAGS)
+endif
+ifeq ($(SHARED_SONAME),1)
+	$(SILENT)mv bin/$(FLAVOUR_DIR)mpg123$(SOSUFFIX) bin/$(FLAVOUR_DIR)$(MPG123_SONAME)
+	$(SILENT)ln -sf $(MPG123_SONAME) bin/$(FLAVOUR_DIR)mpg123$(SOSUFFIX)
+endif
+
+else
+
+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/
 LOCAL_MPG123_SOURCES := 
@@ -726,6 +793,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
@@ -741,6 +809,13 @@ 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/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/libmpg123/ -Iinclude/mpg123/src/compat/ -Iinclude/mpg123/src/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+
+endif
+
 else
 ifeq ($(NO_MPG123),1)
 else
@@ -795,7 +870,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
@@ -1120,6 +1198,7 @@ include/miniz/miniz.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
 ifeq ($(LOCAL_ZLIB),1)
 LIBOPENMPT_C_SOURCES += $(LOCAL_ZLIB_SOURCES)
 LIBOPENMPTTEST_C_SOURCES += $(LOCAL_ZLIB_SOURCES)
+LIBOPENMPT_OBJECTS += $(LOCAL_ZLIB_OBJECTS)
 else
 ifeq ($(NO_ZLIB),1)
 ifeq ($(NO_MINIZ),1)
@@ -1137,6 +1216,8 @@ include/minimp3/minimp3.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT)
 ifeq ($(LOCAL_MPG123),1)
 LIBOPENMPT_C_SOURCES += $(LOCAL_MPG123_SOURCES)
 LIBOPENMPTTEST_C_SOURCES += $(LOCAL_MPG123_SOURCES)
+LIBOPENMPT_OBJECTS += $(LOCAL_MPG123_OBJECTS)
+LIBOPENMPT_LIBS += $(LOCAL_MPG123_LIBS)
 else
 ifeq ($(NO_MPG123),1)
 ifeq ($(NO_MINIMP3),1)
@@ -1155,9 +1236,11 @@ ifeq ($(LOCAL_VORBIS),1)
 ifeq ($(LOCAL_OGG),1)
 LIBOPENMPT_C_SOURCES += $(LOCAL_OGG_SOURCES)
 LIBOPENMPTTEST_C_SOURCES += $(LOCAL_OGG_SOURCES)
+LIBOPENMPT_OBJECTS += $(LOCAL_OGG_OBJECTS)
 endif
 LIBOPENMPT_C_SOURCES += $(LOCAL_VORBIS_SOURCES)
 LIBOPENMPTTEST_C_SOURCES += $(LOCAL_VORBIS_SOURCES)
+LIBOPENMPT_OBJECTS += $(LOCAL_VORBIS_OBJECTS)
 else
 ifeq ($(NO_OGG),1)
 ifeq ($(NO_STBVORBIS),1)
@@ -1199,7 +1282,7 @@ ALL_DEPENDS += $(LIBOPENMPT_DEPENDS)
 ifeq ($(DYNLINK),1)
 OUTPUT_LIBOPENMPT += bin/$(FLAVOUR_DIR)libopenmpt$(SOSUFFIX)
 else
-OBJECTS_LIBOPENMPT += $(LIBOPENMPT_OBJECTS)
+OBJECTS_LIBOPENMPT += $(LIBOPENMPT_OBJECTS) $(LIBOPENMPT_LIBS)
 endif
 
 
@@ -1444,9 +1527,9 @@ else
 	bin/$(FLAVOUR_DIR)libopenmpt_test$(EXESUFFIX)
 endif
 
-bin/$(FLAVOUR_DIR)libopenmpt_test$(EXESUFFIX): $(LIBOPENMPTTEST_OBJECTS) 
+bin/$(FLAVOUR_DIR)libopenmpt_test$(EXESUFFIX): $(LIBOPENMPTTEST_OBJECTS) $(LIBOPENMPT_LIBS)
 	$(INFO) [LD-TEST] $@
-	$(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(TEST_LDFLAGS) $(LIBOPENMPTTEST_OBJECTS) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPTTEST) -o $@
+	$(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(TEST_LDFLAGS) $(LIBOPENMPTTEST_OBJECTS) $(LIBOPENMPT_LIBS) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPTTEST) -o $@
 
 bin/$(FLAVOUR_DIR)libopenmpt.pc:
 	$(INFO) [GEN] $@
@@ -1653,6 +1736,7 @@ bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION).makefile.tar: b
 	svn export ./bin                bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin
 	svn export ./build/download_externals.sh bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/download_externals.sh
 	svn export ./build/android_ndk  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/android_ndk
+	svn export ./build/djgpp        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/djgpp
 	svn export ./build/make         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/make
 	svn export ./build/svn_version  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version
 	svn export ./build/xcode-ios    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/xcode-ios
@@ -1884,6 +1968,11 @@ endif
 	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/SRC
 	cp build/externals/csdpmi7s.zip              bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/SRC/CSDPMI7S.ZIP
 	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/BIN
+ifeq ($(ALLOW_LGPL),1)
+ifeq ($(ENABLE_DXE),1)
+	cp bin/$(FLAVOUR_DIR)mpg123.dxe              bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/BIN/MPG123.DXE
+endif
+endif
 	cp bin/$(FLAVOUR_DIR)openmpt123.exe          bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/BIN/OMPT123.EXE
 	cp include/cwsdpmi/bin/cwsdpmi.doc           bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/BIN/CWSDPMI.DOC
 	cp include/cwsdpmi/bin/CWSDPMI.EXE           bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/BIN/CWSDPMI.EXE
@@ -1954,11 +2043,11 @@ endif
 	#cp bin/$(FLAVOUR_DIR)in_openmpt.dll                        bin/$(FLAVOUR_DIR)dist-retro-win95/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/Winamp/in_openmpt.dll
 	cd bin/$(FLAVOUR_DIR)dist-retro-win95/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/ && 7z a -tzip -mx=9 ../libopenmpt-$(DIST_LIBOPENMPT_VERSION).bin.retro.win95.zip *
 
-bin/$(FLAVOUR_DIR)libopenmpt.a: $(LIBOPENMPT_OBJECTS)
+bin/$(FLAVOUR_DIR)libopenmpt.a: $(LIBOPENMPT_OBJECTS) $(LIBOPENMPT_LIBS)
 	$(INFO) [AR] $@
 	$(SILENT)$(AR) $(ARFLAGS) $@ $^
 
-bin/$(FLAVOUR_DIR)libopenmpt$(SOSUFFIX): $(LIBOPENMPT_OBJECTS)
+bin/$(FLAVOUR_DIR)libopenmpt$(SOSUFFIX): $(LIBOPENMPT_OBJECTS) $(LIBOPENMPT_LIBS)
 	$(INFO) [LD] $@
 ifeq ($(NO_SHARED_LINKER_FLAG),1)
 	$(SILENT)$(LINK.cc) $(LIBOPENMPT_LDFLAGS) $(SO_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
@@ -1974,15 +2063,15 @@ bin/$(FLAVOUR_DIR)openmpt123.1: bin/$(FLAVOUR_DIR)openmpt123$(EXESUFFIX) openmpt
 	$(INFO) [HELP2MAN] $@
 	$(SILENT)help2man --no-discard-stderr --no-info --version-option=--man-version --help-option=--man-help --include=openmpt123/openmpt123.h2m $< > $@
 
-bin/$(FLAVOUR_DIR)in_openmpt$(SOSUFFIX): $(INOPENMPT_OBJECTS) $(LIBOPENMPT_OBJECTS)
+bin/$(FLAVOUR_DIR)in_openmpt$(SOSUFFIX): $(INOPENMPT_OBJECTS) $(LIBOPENMPT_OBJECTS) $(LIBOPENMPT_LIBS)
 	$(INFO) [LD] $@
 ifeq ($(NO_SHARED_LINKER_FLAG),1)
 	$(SILENT)$(LINK.cc) $(LIBOPENMPT_LDFLAGS) $(SO_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 else
 	$(SILENT)$(LINK.cc) -shared $(LIBOPENMPT_LDFLAGS) $(SO_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 endif
 
-bin/$(FLAVOUR_DIR)xmp-openmpt$(SOSUFFIX): $(XMPOPENMPT_OBJECTS) $(LIBOPENMPT_OBJECTS)
+bin/$(FLAVOUR_DIR)xmp-openmpt$(SOSUFFIX): $(XMPOPENMPT_OBJECTS) $(LIBOPENMPT_OBJECTS) $(LIBOPENMPT_LIBS)
 	$(INFO) [LD] $@
 ifeq ($(NO_SHARED_LINKER_FLAG),1)
 	$(SILENT)$(LINK.cc) $(LIBOPENMPT_LDFLAGS) $(SO_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -lgdi32 -o $@

README.md

@@ -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