Author: manx
Date: Wed Apr 10 14:28:04 2024
New Revision: 20561
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20561
Log:
Merged revision(s) 20559 from branches/OpenMPT-1.29:
Merged revision(s) 20553-20554 from trunk/OpenMPT:
[Fix] build: Autotools: Pipe example was missing.
........
[Fix] build: Autotools: libopenmpt_ext.bi was missing.
........
........
Modified:
branches/OpenMPT-1.28/ (props changed)
branches/OpenMPT-1.28/build/autotools/Makefile.am
Modified: branches/OpenMPT-1.28/build/autotools/Makefile.am
==============================================================================
--- branches/OpenMPT-1.28/build/autotools/Makefile.am Wed Apr 10 14:27:33 2024 (r20560)
+++ branches/OpenMPT-1.28/build/autotools/Makefile.am Wed Apr 10 14:28:04 2024 (r20561)
@@ -23,6 +23,7 @@
EXTRA_DIST += man/openmpt123.1
EXTRA_DIST += examples/.clang-format
EXTRA_DIST += libopenmpt/bindings/freebasic/libopenmpt.bi
+EXTRA_DIST += libopenmpt/bindings/freebasic/libopenmpt_ext.bi
MOSTLYCLEANFILES =
dist_doc_DATA =
@@ -33,6 +34,7 @@
nobase_dist_doc_DATA += examples/libopenmpt_example_c_mem.c
nobase_dist_doc_DATA += examples/libopenmpt_example_c_unsafe.c
nobase_dist_doc_DATA += examples/libopenmpt_example_c.c
+nobase_dist_doc_DATA += examples/libopenmpt_example_c_pipe.c
nobase_dist_doc_DATA += examples/libopenmpt_example_c_probe.c
nobase_dist_doc_DATA += examples/libopenmpt_example_c_stdout.c
@@ -45,8 +47,9 @@
if ENABLE_EXAMPLES
-check_PROGRAMS += libopenmpt_example_c_stdout
+check_PROGRAMS += libopenmpt_example_c_pipe
check_PROGRAMS += libopenmpt_example_c_probe
+check_PROGRAMS += libopenmpt_example_c_stdout
if HAVE_PORTAUDIO
check_PROGRAMS += libopenmpt_example_c
check_PROGRAMS += libopenmpt_example_c_mem
@@ -56,8 +59,9 @@
check_PROGRAMS += libopenmpt_example_cxx
endif
-libopenmpt_example_c_stdout_SOURCES = examples/libopenmpt_example_c_stdout.c
+libopenmpt_example_c_pipe_SOURCES = examples/libopenmpt_example_c_pipe.c
libopenmpt_example_c_probe_SOURCES = examples/libopenmpt_example_c_probe.c
+libopenmpt_example_c_stdout_SOURCES = examples/libopenmpt_example_c_stdout.c
if HAVE_PORTAUDIO
libopenmpt_example_c_SOURCES = examples/libopenmpt_example_c.c
libopenmpt_example_c_mem_SOURCES = examples/libopenmpt_example_c_mem.c
@@ -67,8 +71,9 @@
libopenmpt_example_cxx_SOURCES = examples/libopenmpt_example_cxx.cpp
endif
-libopenmpt_example_c_stdout_CPPFLAGS =
+libopenmpt_example_c_pipe_CPPFLAGS =
libopenmpt_example_c_probe_CPPFLAGS =
+libopenmpt_example_c_stdout_CPPFLAGS =
if HAVE_PORTAUDIO
libopenmpt_example_c_CPPFLAGS = $(PORTAUDIO_CFLAGS)
libopenmpt_example_c_mem_CPPFLAGS = $(PORTAUDIO_CFLAGS)
@@ -78,8 +83,9 @@
libopenmpt_example_cxx_CPPFLAGS = $(MINGWSTDTHREADS_CPPFLAGS) $(PORTAUDIOCPP_CFLAGS)
endif
-libopenmpt_example_c_stdout_CFLAGS = $(WIN32_CONSOLE_CFLAGS)
+libopenmpt_example_c_pipe_CFLAGS = $(WIN32_CONSOLE_CFLAGS)
libopenmpt_example_c_probe_CFLAGS = $(WIN32_CONSOLE_CFLAGS)
+libopenmpt_example_c_stdout_CFLAGS = $(WIN32_CONSOLE_CFLAGS)
if HAVE_PORTAUDIO
libopenmpt_example_c_CFLAGS = $(WIN32_CONSOLE_CFLAGS)
libopenmpt_example_c_mem_CFLAGS = $(WIN32_CONSOLE_CFLAGS)
@@ -89,8 +95,9 @@
libopenmpt_example_cxx_CXXFLAGS = $(WIN32_CONSOLE_CXXFLAGS)
endif
-libopenmpt_example_c_stdout_LDADD = $(lib_LTLIBRARIES)
+libopenmpt_example_c_pipe_LDADD = $(lib_LTLIBRARIES)
libopenmpt_example_c_probe_LDADD = $(lib_LTLIBRARIES)
+libopenmpt_example_c_stdout_LDADD = $(lib_LTLIBRARIES)
if HAVE_PORTAUDIO
libopenmpt_example_c_LDADD = $(lib_LTLIBRARIES) $(PORTAUDIO_LIBS)
libopenmpt_example_c_mem_LDADD = $(lib_LTLIBRARIES) $(PORTAUDIO_LIBS)
|
