Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4265] trunk/OpenMPT
|
From: <man...@us...> - 2014-09-08 08:10:24
|
Revision: 4265
http://sourceforge.net/p/modplug/code/4265
Author: manxorist
Date: 2014-09-08 08:10:15 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
[New] build: Autotools: Add --enable-libopenmpt_modplug and --enable-libmodplug which build the emulation layer of the libmodplug interface.
[Mod] build: Makefile: Do not install libopenmpt_modplug by default. Move it to its own target 'install-openmpt-modplug'. It is not of much use stand-alone and should not be installed by default.
Modified Paths:
--------------
trunk/OpenMPT/Makefile
trunk/OpenMPT/build/autotools/Makefile.am
trunk/OpenMPT/build/autotools/autoconfiscate.sh
trunk/OpenMPT/build/autotools/configure.ac
Added Paths:
-----------
trunk/OpenMPT/include/modplug/include/libmodplug/libmodplug.pc.in
Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile 2014-09-08 06:26:13 UTC (rev 4264)
+++ trunk/OpenMPT/Makefile 2014-09-08 08:10:15 UTC (rev 4265)
@@ -606,7 +606,6 @@
$(INSTALL_LIB) bin/libopenmpt$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libopenmpt$(SOSUFFIX)
endif
$(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/lib
- $(INSTALL_LIB) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libopenmpt_modplug$(SOSUFFIX)
endif
ifeq ($(STATIC_LIB),1)
$(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/lib
@@ -639,13 +638,22 @@
#$(INSTALL_DATA_DIR) bin/docs/man $(DESTDIR)$(PREFIX)/share/man
endif
+.PHONY: install-openmpt-modplug
+install-openmpt-modplug: $(OUTPUTS)
+ifeq ($(SHARED_LIB),1)
+ $(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/lib
+ $(INSTALL_LIB) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libopenmpt_modplug$(SOSUFFIX)
+ $(INSTALL_LIB) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libopenmpt_modplug$(SOSUFFIX).0
+ $(INSTALL_LIB) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libopenmpt_modplug$(SOSUFFIX).0.0.0
+endif
+
.PHONY: install-modplug
install-modplug: $(OUTPUTS)
ifeq ($(SHARED_LIB),1)
$(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/lib
- $(INSTALL_DATA) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libmodplug$(SOSUFFIX)
- $(INSTALL_DATA) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libmodplug$(SOSUFFIX).0
- $(INSTALL_DATA) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libmodplug$(SOSUFFIX).0.0.0
+ $(INSTALL_LIB) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libmodplug$(SOSUFFIX)
+ $(INSTALL_LIB) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libmodplug$(SOSUFFIX).0
+ $(INSTALL_LIB) bin/libopenmpt_modplug$(SOSUFFIX) $(DESTDIR)$(PREFIX)/lib/libmodplug$(SOSUFFIX).0.0.0
endif
.PHONY: dist
Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am 2014-09-08 06:26:13 UTC (rev 4264)
+++ trunk/OpenMPT/build/autotools/Makefile.am 2014-09-08 08:10:15 UTC (rev 4265)
@@ -2,6 +2,7 @@
EXTRA_DIST =
EXTRA_DIST += m4/emptydir
EXTRA_DIST += libopenmpt/libopenmpt.pc.in
+EXTRA_DIST += libmodplug/libmodplug.pc.in
EXTRA_DIST += LICENSE
EXTRA_DIST += README.md
EXTRA_DIST += Doxyfile.in
@@ -28,6 +29,7 @@
bin_PROGRAMS =
check_PROGRAMS =
+lib_LTLIBRARIES =
TESTS = libopenmpttest
check_PROGRAMS += libopenmpt_example_c_stdout
@@ -59,11 +61,13 @@
endif
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libopenmpt/libopenmpt.pc
+pkgconfig_DATA =
+nobase_include_HEADERS =
-lib_LTLIBRARIES = libopenmpt.la
+pkgconfig_DATA += libopenmpt/libopenmpt.pc
+lib_LTLIBRARIES += libopenmpt.la
libopenmpt_la_LDFLAGS = -version-info 0:7:0
-nobase_include_HEADERS = libopenmpt/libopenmpt.h libopenmpt/libopenmpt.hpp libopenmpt/libopenmpt_version.h libopenmpt/libopenmpt_config.h libopenmpt/libopenmpt_stream_callbacks_fd.h libopenmpt/libopenmpt_stream_callbacks_file.h
+nobase_include_HEADERS += libopenmpt/libopenmpt.h libopenmpt/libopenmpt.hpp libopenmpt/libopenmpt_version.h libopenmpt/libopenmpt_config.h libopenmpt/libopenmpt_stream_callbacks_fd.h libopenmpt/libopenmpt_stream_callbacks_file.h
libopenmpt_la_CPPFLAGS = -DLIBOPENMPT_BUILD -I$(srcdir)/build/svn_version -I$(srcdir)/ -I$(srcdir)/common $(ZLIB_CFLAGS)
libopenmpt_la_CXXFLAGS = $(ZLIB_CFLAGS)
libopenmpt_la_CFLAGS = $(ZLIB_CFLAGS)
@@ -225,6 +229,32 @@
libopenmpt_la_SOURCES += libopenmpt/libopenmpt_stream_callbacks_file.h
libopenmpt_la_SOURCES += libopenmpt/libopenmpt_version.h
+if ENABLE_LIBOPENMPT_MODPLUG
+lib_LTLIBRARIES += libopenmpt_modplug.la
+libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0
+libopenmpt_modplug_la_CPPFLAGS = -I$(srcdir)/
+libopenmpt_modplug_la_CXXFLAGS =
+libopenmpt_modplug_la_CFLAGS =
+libopenmpt_modplug_la_LIBADD = libopenmpt.la
+libopenmpt_modplug_la_SOURCES =
+libopenmpt_modplug_la_SOURCES += libopenmpt/libopenmpt_modplug.c
+libopenmpt_modplug_la_SOURCES += libopenmpt/libopenmpt_modplug_cpp.cpp
+endif
+
+if ENABLE_LIBMODPLUG
+pkgconfig_DATA += libmodplug/libmodplug.pc
+lib_LTLIBRARIES += libmodplug.la
+libmodplug_la_LDFLAGS = -version-info 1:0:0
+nobase_include_HEADERS += libmodplug/modplug.h libmodplug/sndfile.h libmodplug/stdafx.h
+libmodplug_la_CPPFLAGS = -I$(srcdir)/
+libmodplug_la_CXXFLAGS =
+libmodplug_la_CFLAGS =
+libmodplug_la_LIBADD = libopenmpt.la
+libmodplug_la_SOURCES =
+libmodplug_la_SOURCES += libopenmpt/libopenmpt_modplug.c
+libmodplug_la_SOURCES += libopenmpt/libopenmpt_modplug_cpp.cpp
+endif
+
check_PROGRAMS += libopenmpttest
libopenmpttest_CPPFLAGS = -DLIBOPENMPT_BUILD -DLIBOPENMPT_BUILD_TEST -I$(srcdir)/build/svn_version -I$(srcdir)/ -I$(srcdir)/common $(ZLIB_CFLAGS)
libopenmpttest_CXXFLAGS = $(ZLIB_CFLAGS)
@@ -396,7 +426,7 @@
bin_PROGRAMS += openmpt123
openmpt123_CPPFLAGS = -I$(srcdir)/src/openmpt123 $(PORTAUDIO_CFLAGS) $(SDL_CFLAGS) $(SNDFILE_CFLAGS) $(FLAC_CFLAGS)
-openmpt123_LDADD = $(lib_LTLIBRARIES) $(PORTAUDIO_LIBS) $(SDL_LIBS) $(SNDFILE_LIBS) $(FLAC_LIBS)
+openmpt123_LDADD = libopenmpt.la $(PORTAUDIO_LIBS) $(SDL_LIBS) $(SNDFILE_LIBS) $(FLAC_LIBS)
openmpt123_SOURCES =
openmpt123_SOURCES += src/openmpt123/openmpt123_config.hpp
openmpt123_SOURCES += src/openmpt123/openmpt123.cpp
Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh
===================================================================
--- trunk/OpenMPT/build/autotools/autoconfiscate.sh 2014-09-08 06:26:13 UTC (rev 4264)
+++ trunk/OpenMPT/build/autotools/autoconfiscate.sh 2014-09-08 08:10:15 UTC (rev 4265)
@@ -35,6 +35,7 @@
mkdir bin/dist-autotools/src
svn export ./openmpt123 bin/dist-autotools/src/openmpt123
#svn export ./openmpt123 bin/dist-autotools/openmpt123
+svn export ./include/modplug/include/libmodplug bin/dist-autotools/libmodplug
mkdir bin/dist-autotools/build
mkdir bin/dist-autotools/build/svn_version
svn export ./build/svn_version/svn_version.h bin/dist-autotools/build/svn_version/svn_version.h
Modified: trunk/OpenMPT/build/autotools/configure.ac
===================================================================
--- trunk/OpenMPT/build/autotools/configure.ac 2014-09-08 06:26:13 UTC (rev 4264)
+++ trunk/OpenMPT/build/autotools/configure.ac 2014-09-08 08:10:15 UTC (rev 4265)
@@ -4,7 +4,7 @@
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_FILES([Makefile libopenmpt/libopenmpt.pc Doxyfile])
+AC_CONFIG_FILES([Makefile libopenmpt/libopenmpt.pc libmodplug/libmodplug.pc Doxyfile])
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign subdir-objects])
@@ -72,6 +72,17 @@
AX_CXXFLAGS_WARN_ALL
AC_LANG_POP([C++])
+# libmodplug emulation
+AC_ARG_ENABLE([libopenmpt_modplug], AS_HELP_STRING([--enable-libopenmpt_modplug], [Enable the libopenmpt_modplug emulation library of the libmodplug interface.]))
+AM_CONDITIONAL([ENABLE_LIBOPENMPT_MODPLUG], [test "x$enable_libopenmpt_modplug" = "xyes"])
+
+# libmodplug replacement
+AC_ARG_ENABLE([libmodplug], AS_HELP_STRING([--enable-libmodplug], [Enable libmodplug replacement library based on libopenmpt.
+WARNING: This will replace your current libmodplug installation.
+CAUTION: The emulation of the libmodplug interface is not complete as libmodplug exposes lots of internal implementation details. If any of those is used by an application, the emulation via libopenmpt will fail and/or crash.
+]))
+AM_CONDITIONAL([ENABLE_LIBMODPLUG], [test "x$enable_libmodplug" = "xyes"])
+
DX_DOXYGEN_FEATURE(ON)
DX_DOT_FEATURE(OFF)
DX_HTML_FEATURE(ON)
Added: trunk/OpenMPT/include/modplug/include/libmodplug/libmodplug.pc.in
===================================================================
--- trunk/OpenMPT/include/modplug/include/libmodplug/libmodplug.pc.in (rev 0)
+++ trunk/OpenMPT/include/modplug/include/libmodplug/libmodplug.pc.in 2014-09-08 08:10:15 UTC (rev 4265)
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=${prefix}/include
+
+Name: libmodplug
+Description: The ModPlug mod file playing library (emulated via libopenmpt).
+Version: 0.8.8.5
+Requires: libopenmpt
+Libs:
+Libs.private:
+Cflags: -I${includedir}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
