[OMPT-svn-commit] OpenMPT r22929 - trunk/OpenMPT/contrib/libmodplug-0.8.8.5

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

Author: manx
Date: Sat Feb 15 19:17:03 2025
New Revision: 22929
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22929

Log:
Revert r22895:
Merged revision(s) 22895 from trunk/OpenMPT:
[Fix] libmodplug-0.8.8.5: Fix typo in linker option --no-undefined.
[Mod] libmodplug-0.8.8.5: Version is now 0.8.8.5-openmpt2. 
........

Modified:
   trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am
   trunk/OpenMPT/contrib/libmodplug-0.8.8.5/configure.ac

Modified: trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am
==============================================================================
--- trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am	Sat Feb 15 19:16:29 2025	(r22928)
+++ trunk/OpenMPT/contrib/libmodplug-0.8.8.5/Makefile.am	Sat Feb 15 19:17:03 2025	(r22929)
@@ -21,7 +21,7 @@
 
 if ENABLE_LIBOPENMPT_MODPLUG
 lib_LTLIBRARIES += libopenmpt_modplug.la
-libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 --no-undefined
+libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined
 libopenmpt_modplug_la_CPPFLAGS = -I$(srcdir)/ $(LIBOPENMPT_CPPFLAGS)
 libopenmpt_modplug_la_CXXFLAGS = $(LIBOPENMPT_CFLAGS)
 libopenmpt_modplug_la_CFLAGS = $(LIBOPENMPT_CFLAGS)
@@ -34,7 +34,7 @@
 if ENABLE_LIBMODPLUG
 pkgconfig_DATA += libmodplug.pc
 lib_LTLIBRARIES += libmodplug.la
-libmodplug_la_LDFLAGS = -version-info 1:0:0 --no-undefined
+libmodplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined
 nobase_include_HEADERS += libmodplug/modplug.h libmodplug/sndfile.h libmodplug/stdafx.h
 libmodplug_la_CPPFLAGS = -I$(srcdir)/ $(LIBOPENMPT_CPPFLAGS)
 libmodplug_la_CXXFLAGS = $(LIBOPENMPT_CFLAGS)

Modified: trunk/OpenMPT/contrib/libmodplug-0.8.8.5/configure.ac
==============================================================================
--- trunk/OpenMPT/contrib/libmodplug-0.8.8.5/configure.ac	Sat Feb 15 19:16:29 2025	(r22928)
+++ trunk/OpenMPT/contrib/libmodplug-0.8.8.5/configure.ac	Sat Feb 15 19:17:03 2025	(r22929)
@@ -1,4 +1,4 @@
-AC_INIT([libopenmpt-modplug], [0.8.8.5-openmpt2], [https://bugs.openmpt.org/], [libopenmpt-modplug], [https://lib.openmpt.org/])
+AC_INIT([libopenmpt-modplug], [0.8.8.5-openmpt1], [https://bugs.openmpt.org/], [libopenmpt-modplug], [https://lib.openmpt.org/])
 AC_PREREQ([2.68])
 
 AC_CONFIG_MACRO_DIR([m4])