[OMPT-svn-commit] OpenMPT r20290 - in branches/OpenMPT-1.31: . build/make include/vorbis include/vorbis/lib

[<sv...@op...>]

Author: manx
Date: Fri Mar  8 15:58:13 2024
New Revision: 20290
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20290

Log:
Merged revision(s) 19896 from trunk/OpenMPT:
[Ref] build: Makefile: Avoid patching Vorbis for DJGPP.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/Makefile
   branches/OpenMPT-1.31/build/make/config-djgpp.mk
   branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt
   branches/OpenMPT-1.31/include/vorbis/lib/os.h

Modified: branches/OpenMPT-1.31/Makefile
==============================================================================
--- branches/OpenMPT-1.31/Makefile	Fri Mar  8 14:06:00 2024	(r20289)
+++ branches/OpenMPT-1.31/Makefile	Fri Mar  8 15:58:13 2024	(r20290)
@@ -800,7 +800,10 @@
 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

Modified: branches/OpenMPT-1.31/build/make/config-djgpp.mk
==============================================================================
--- branches/OpenMPT-1.31/build/make/config-djgpp.mk	Fri Mar  8 14:06:00 2024	(r20289)
+++ branches/OpenMPT-1.31/build/make/config-djgpp.mk	Fri Mar  8 15:58:13 2024	(r20290)
@@ -393,6 +393,8 @@
 # causes crashes on process shutdown with liballegro
 MPT_COMPILER_NOGCSECTIONS=1
 
+MPT_COMPILER_NOALLOCAH=1
+
 ifeq ($(OPTIMIZE_LTO),1)
 CXXFLAGS += -flto=auto -Wno-attributes
 CFLAGS   += -flto=auto -Wno-attributes

Modified: branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt	Fri Mar  8 14:06:00 2024	(r20289)
+++ branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt	Fri Mar  8 15:58:13 2024	(r20290)
@@ -2,7 +2,6 @@
 The following changes have been made:
 - Obviously, unnecessary folders and files (doc, examples, m4, macos, macosx,
   symbian, test, vq) have been removed.
-- Building for DJGPP has been fixed.
 - https://github.com/xiph/vorbis/pull/100 and
   https://github.com/xiph/vorbis/pull/101 have been applied.
 - All modifications have been marked with /* OpenMPT */.

Modified: branches/OpenMPT-1.31/include/vorbis/lib/os.h
==============================================================================
--- branches/OpenMPT-1.31/include/vorbis/lib/os.h	Fri Mar  8 14:06:00 2024	(r20289)
+++ branches/OpenMPT-1.31/include/vorbis/lib/os.h	Fri Mar  8 15:58:13 2024	(r20290)
@@ -62,11 +62,9 @@
 
 #endif /* _V_IFDEFJAIL_H_ */
 
-#if !defined(__DJGPP__) /* OpenMPT */
 #ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 #endif
-#endif /* OpenMPT */
 
 #ifdef USE_MEMORY_H
 #  include <memory.h>