[OMPT-svn-commit] OpenMPT r21917 - in branches/OpenMPT-1.31: . build/autotools

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

Author: manx
Date: Sat Oct 26 11:38:52 2024
New Revision: 21917
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21917

Log:
Merged revision(s) 21916 from trunk/OpenMPT:
[Fix] build: Autotools: Do not clobber user CFLAGS.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/build/autotools/Makefile.am
   branches/OpenMPT-1.31/build/autotools/configure.ac

Modified: branches/OpenMPT-1.31/build/autotools/Makefile.am
==============================================================================
--- branches/OpenMPT-1.31/build/autotools/Makefile.am	Sat Oct 26 10:36:42 2024	(r21916)
+++ branches/OpenMPT-1.31/build/autotools/Makefile.am	Sat Oct 26 11:38:52 2024	(r21917)
@@ -89,16 +89,16 @@
 libopenmpt_example_cxx_CPPFLAGS = $(WIN32_CPPFLAGS) $(PORTAUDIOCPP_CFLAGS)
 endif
 
-libopenmpt_example_c_pipe_CFLAGS = $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
-libopenmpt_example_c_probe_CFLAGS = $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
-libopenmpt_example_c_stdout_CFLAGS = $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
+libopenmpt_example_c_pipe_CFLAGS = $(GLOBAL_CFLAGS) $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
+libopenmpt_example_c_probe_CFLAGS = $(GLOBAL_CFLAGS) $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
+libopenmpt_example_c_stdout_CFLAGS = $(GLOBAL_CFLAGS) $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
 if HAVE_PORTAUDIO
-libopenmpt_example_c_CFLAGS = $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
-libopenmpt_example_c_mem_CFLAGS = $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
-libopenmpt_example_c_unsafe_CFLAGS = $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
+libopenmpt_example_c_CFLAGS = $(GLOBAL_CFLAGS) $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
+libopenmpt_example_c_mem_CFLAGS = $(GLOBAL_CFLAGS) $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
+libopenmpt_example_c_unsafe_CFLAGS = $(GLOBAL_CFLAGS) $(WIN32_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
 endif
 if HAVE_PORTAUDIOCPP
-libopenmpt_example_cxx_CXXFLAGS = $(WIN32_CXXFLAGS) $(WIN32_CONSOLE_CXXFLAGS)
+libopenmpt_example_cxx_CXXFLAGS = $(GLOBAL_CXXFLAGS) $(WIN32_CXXFLAGS) $(WIN32_CONSOLE_CXXFLAGS)
 endif
 
 libopenmpt_example_c_pipe_LDADD = $(lib_LTLIBRARIES)
@@ -561,11 +561,11 @@
 includelibopenmpt_HEADERS += libopenmpt/libopenmpt_ext.h
 includelibopenmpt_HEADERS += libopenmpt/libopenmpt_ext.hpp
 libopenmpt_la_CPPFLAGS =
-libopenmpt_la_CPPFLAGS += $(WIN32_CPPFLAGS) -DLIBOPENMPT_BUILD -I$(srcdir)/ -I$(srcdir)/src -I$(srcdir)/common $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS)
+libopenmpt_la_CPPFLAGS += $(GLOBAL_CPPFLAGS) $(WIN32_CPPFLAGS) -DLIBOPENMPT_BUILD -I$(srcdir)/ -I$(srcdir)/src -I$(srcdir)/common $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS)
 libopenmpt_la_CXXFLAGS =
-libopenmpt_la_CXXFLAGS += $(WIN32_CXXFLAGS) $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS)
+libopenmpt_la_CXXFLAGS += $(GLOBAL_CXXFLAGS) $(WIN32_CXXFLAGS) $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS)
 libopenmpt_la_CFLAGS =
-libopenmpt_la_CFLAGS += $(WIN32_CFLAGS) $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS)
+libopenmpt_la_CFLAGS += $(GLOBAL_CFLAGS) $(WIN32_CFLAGS) $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS)
 libopenmpt_la_LIBADD =
 libopenmpt_la_LIBADD += $(ZLIB_LIBS) $(MPG123_LIBS) $(OGG_LIBS) $(VORBIS_LIBS) $(VORBISFILE_LIBS) $(LIBOPENMPT_WIN32_LIBS)
 libopenmpt_la_SOURCES = 
@@ -600,11 +600,11 @@
 if ENABLE_TESTS
 check_PROGRAMS += libopenmpttest
 libopenmpttest_CPPFLAGS =
-libopenmpttest_CPPFLAGS += $(WIN32_CPPFLAGS) -DLIBOPENMPT_BUILD -DLIBOPENMPT_BUILD_TEST -I$(srcdir)/ -I$(srcdir)/src -I$(srcdir)/common $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS)
+libopenmpttest_CPPFLAGS += $(GLOBAL_CPPFLAGS) $(WIN32_CPPFLAGS) -DLIBOPENMPT_BUILD -DLIBOPENMPT_BUILD_TEST -I$(srcdir)/ -I$(srcdir)/src -I$(srcdir)/common $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS)
 libopenmpttest_CXXFLAGS =
-libopenmpttest_CXXFLAGS += $(WIN32_CXXFLAGS) $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) $(WIN32_CONSOLE_CXXFLAGS)
+libopenmpttest_CXXFLAGS += $(GLOBAL_CXXFLAGS) $(WIN32_CXXFLAGS) $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) $(WIN32_CONSOLE_CXXFLAGS)
 libopenmpttest_CFLAGS =
-libopenmpttest_CFLAGS += $(WIN32_CFLAGS) $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
+libopenmpttest_CFLAGS += $(GLOBAL_CFLAGS) $(WIN32_CFLAGS) $(ZLIB_CFLAGS) $(MPG123_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) $(VORBISFILE_CFLAGS) $(WIN32_CONSOLE_CFLAGS)
 libopenmpttest_LDADD =
 libopenmpttest_LDADD += $(ZLIB_LIBS) $(MPG123_LIBS) $(OGG_LIBS) $(VORBIS_LIBS) $(VORBISFILE_LIBS) $(LIBOPENMPT_WIN32_LIBS) $(LIBOPENMPTTEST_WIN32_LIBS)
 libopenmpttest_SOURCES = 
@@ -661,9 +661,9 @@
 
 bin_PROGRAMS += bin/openmpt123
 bin_openmpt123_CPPFLAGS =
-bin_openmpt123_CPPFLAGS += $(WIN32_CPPFLAGS) -I$(srcdir)/src $(PORTAUDIO_CFLAGS) $(PULSEAUDIO_CFLAGS) $(SDL2_CFLAGS) $(SNDFILE_CFLAGS) $(FLAC_CFLAGS)
+bin_openmpt123_CPPFLAGS += $(GLOBAL_CPPFLAGS) $(WIN32_CPPFLAGS) -I$(srcdir)/src $(PORTAUDIO_CFLAGS) $(PULSEAUDIO_CFLAGS) $(SDL2_CFLAGS) $(SNDFILE_CFLAGS) $(FLAC_CFLAGS)
 bin_openmpt123_CXXFLAGS =
-bin_openmpt123_CXXFLAGS += $(WIN32_CXXFLAGS) $(WIN32_CONSOLE_CXXFLAGS)
+bin_openmpt123_CXXFLAGS += $(GLOBAL_CXXFLAGS) $(WIN32_CXXFLAGS) $(WIN32_CONSOLE_CXXFLAGS)
 bin_openmpt123_LDADD = libopenmpt.la $(PORTAUDIO_LIBS) $(PULSEAUDIO_LIBS) $(SDL2_LIBS) $(SNDFILE_LIBS) $(FLAC_LIBS) $(OPENMPT123_WIN32_LIBS)
 bin_openmpt123_SOURCES = 
 bin_openmpt123_SOURCES += $(MPT_FILES_SRC_MPT)

Modified: branches/OpenMPT-1.31/build/autotools/configure.ac
==============================================================================
--- branches/OpenMPT-1.31/build/autotools/configure.ac	Sat Oct 26 10:36:42 2024	(r21916)
+++ branches/OpenMPT-1.31/build/autotools/configure.ac	Sat Oct 26 11:38:52 2024	(r21917)
@@ -31,13 +31,17 @@
  ],[]
 )
 
+GLOBAL_CPPFLAGS=
+GLOBAL_CFLAGS=
+GLOBAL_CXXFLAGS=
+
 AC_LANG_PUSH([C])
-AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [CFLAGS="$CFLAGS -fvisibility=hidden"])
+AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [GLOBAL_CFLAGS="$GLOBAL_CFLAGS -fvisibility=hidden"])
 AX_CFLAGS_WARN_ALL
 AC_LANG_POP([C])
 
 AC_LANG_PUSH([C++])
-AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [CXXFLAGS="$CXXFLAGS -fvisibility=hidden"])
+AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [GLOBAL_CXXFLAGS="$GLOBAL_CXXFLAGS -fvisibility=hidden"])
 AX_CXXFLAGS_WARN_ALL
 AC_LANG_POP([C++])
 
@@ -46,8 +50,8 @@
 
 AX_PTHREAD([
  LIBS="$PTHREAD_LIBS $LIBS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+ GLOBAL_CFLAGS="$GLOBAL_CFLAGS $PTHREAD_CFLAGS"
+ GLOBAL_CXXFLAGS="$GLOBAL_CXXFLAGS $PTHREAD_CFLAGS"
  #CC="$PTHREAD_CC"
  #CXX="$PTHREAD_CXX"
  ],
@@ -58,15 +62,20 @@
 # This is somewhat pessimistic, but necessary for GCC 8 or earlier,
 # which we still support and where we cannot use #pragma GCC optimize.
 AC_LANG_PUSH([C])
-AX_CHECK_COMPILE_FLAG([-fno-ipa-ra], [CFLAGS="$CFLAGS -fno-ipa-ra"])
+AX_CHECK_COMPILE_FLAG([-fno-ipa-ra], [GLOBAL_CFLAGS="$GLOBAL_CFLAGS -fno-ipa-ra"])
 AX_CFLAGS_WARN_ALL
 AC_LANG_POP([C])
 AC_LANG_PUSH([C++])
-AX_CHECK_COMPILE_FLAG([-fno-ipa-ra], [CXXFLAGS="$CXXFLAGS -fno-ipa-ra"])
+AX_CHECK_COMPILE_FLAG([-fno-ipa-ra], [GLOBAL_CXXFLAGS="$GLOBAL_CXXFLAGS -fno-ipa-ra"])
 AX_CXXFLAGS_WARN_ALL
 AC_LANG_POP([C++])
 
 
+AC_SUBST([GLOBAL_CPPFLAGS])
+AC_SUBST([GLOBAL_CFLAGS])
+AC_SUBST([GLOBAL_CXXFLAGS])
+
+
 LIBOPENMPT_LTVER_CURRENT=!!MPT_LIBOPENMPT_LTVER_CURRENT!!
 LIBOPENMPT_LTVER_REVISION=!!MPT_LIBOPENMPT_LTVER_REVISION!!
 LIBOPENMPT_LTVER_AGE=!!MPT_LIBOPENMPT_LTVER_AGE!!