[OMPT-svn-commit] SF.net SVN: modplug:[4585] trunk/OpenMPT

[<man...@us...>]

Revision: 4585
          http://sourceforge.net/p/modplug/code/4585
Author:   manxorist
Date:     2014-11-10 12:39:42 +0000 (Mon, 10 Nov 2014)
Log Message:
-----------
[Mod] build: Remove EXPERIMENTAL_LIBOPENMPT_EXT option from Makefile again. libopenmpt_ext is already included in Visual Studio as well as in Autotools and Android builds. There is no point in not including it in Makefile builds by default.
[Mod] build: Distribute libopenmpt_ext.hpp in autotools and windows packages.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/build/auto/package_libopenmpt_win32.cmd
    trunk/OpenMPT/build/auto/package_libopenmpt_win64.cmd
    trunk/OpenMPT/build/autotools/Makefile.am
    trunk/OpenMPT/libopenmpt/dox/changelog.md

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2014-11-10 11:39:10 UTC (rev 4584)
+++ trunk/OpenMPT/Makefile	2014-11-10 12:39:42 UTC (rev 4585)
@@ -49,10 +49,6 @@
 #  ANCIENT=0        Use a pre-C++0x compiler (i.e. GCC before 4.3)
 #
 #
-# Experimental features (need to be enabled explicitely):
-#  EXPERIMENTAL_LIBOPENMPT_EXT=1 Include libopenmpt_ext interface.
-#
-#
 # Build flags for libopenmpt (provide on each `make` invocation)
 #  (defaults are 0):
 #
@@ -135,9 +131,7 @@
 SOSUFFIX=.so
 OPENMPT123=1
 
-EXPERIMENTAL_LIBOPENMPT_EXT=0
 
-
 # get commandline or defaults
 
 CPPFLAGS := $(CPPFLAGS)
@@ -438,10 +432,8 @@
  libopenmpt/libopenmpt_c.cpp \
  libopenmpt/libopenmpt_cxx.cpp \
  libopenmpt/libopenmpt_impl.cpp \
+ libopenmpt/libopenmpt_ext.cpp \
  
-ifeq ($(EXPERIMENTAL_LIBOPENMPT_EXT),1)
-LIBOPENMPT_CXX_SOURCES += libopenmpt/libopenmpt_ext.cpp
-endif
 ifeq ($(NO_ZLIB),1)
 LIBOPENMPT_C_SOURCES += include/miniz/miniz.c
 endif
@@ -637,9 +629,7 @@
 	$(INSTALL_DATA) libopenmpt/libopenmpt_stream_callbacks_fd.h $(DESTDIR)$(PREFIX)/include/libopenmpt/libopenmpt_stream_callbacks_fd.h
 	$(INSTALL_DATA) libopenmpt/libopenmpt_stream_callbacks_file.h $(DESTDIR)$(PREFIX)/include/libopenmpt/libopenmpt_stream_callbacks_file.h
 	$(INSTALL_DATA) libopenmpt/libopenmpt.hpp $(DESTDIR)$(PREFIX)/include/libopenmpt/libopenmpt.hpp
-ifeq ($(EXPERIMENTAL_LIBOPENMPT_EXT),1)
 	$(INSTALL_DATA) libopenmpt/libopenmpt_ext.hpp $(DESTDIR)$(PREFIX)/include/libopenmpt/libopenmpt_ext.hpp
-endif
 	$(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/lib/pkgconfig
 	$(INSTALL_DATA) bin/libopenmpt.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/libopenmpt.pc
 ifeq ($(SHARED_LIB),1)

Modified: trunk/OpenMPT/build/auto/package_libopenmpt_win32.cmd
===================================================================
--- trunk/OpenMPT/build/auto/package_libopenmpt_win32.cmd	2014-11-10 11:39:10 UTC (rev 4584)
+++ trunk/OpenMPT/build/auto/package_libopenmpt_win32.cmd	2014-11-10 12:39:42 UTC (rev 4585)
@@ -18,6 +18,7 @@
 copy /y ..\..\libopenmpt\libopenmpt.hpp inc\libopenmpt\ || goto error
 copy /y ..\..\libopenmpt\libopenmpt_config.h inc\libopenmpt\ || goto error
 copy /y ..\..\libopenmpt\libopenmpt_version.h inc\libopenmpt\ || goto error
+copy /y ..\..\libopenmpt\libopenmpt_ext.hpp inc\libopenmpt\ || goto error
 copy /y libopenmpt.lib lib\Win32\ || goto error
 copy /y libopenmpt.dll bin\Win32\ || goto error
 copy /y ..\..\libopenmpt\doc\in_openmpt.txt .\ || goto error

Modified: trunk/OpenMPT/build/auto/package_libopenmpt_win64.cmd
===================================================================
--- trunk/OpenMPT/build/auto/package_libopenmpt_win64.cmd	2014-11-10 11:39:10 UTC (rev 4584)
+++ trunk/OpenMPT/build/auto/package_libopenmpt_win64.cmd	2014-11-10 12:39:42 UTC (rev 4585)
@@ -18,6 +18,7 @@
 copy /y ..\..\libopenmpt\libopenmpt.hpp inc\libopenmpt\ || goto error
 copy /y ..\..\libopenmpt\libopenmpt_config.h inc\libopenmpt\ || goto error
 copy /y ..\..\libopenmpt\libopenmpt_version.h inc\libopenmpt\ || goto error
+copy /y ..\..\libopenmpt\libopenmpt_ext.hpp inc\libopenmpt\ || goto error
 copy /y libopenmpt.lib lib\x64\ || goto error
 copy /y libopenmpt.dll bin\x64\ || goto error
 copy /y ..\..\LICENSE .\ || goto error

Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am	2014-11-10 11:39:10 UTC (rev 4584)
+++ trunk/OpenMPT/build/autotools/Makefile.am	2014-11-10 12:39:42 UTC (rev 4585)
@@ -67,7 +67,7 @@
 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/libopenmpt_ext.hpp
 libopenmpt_la_CPPFLAGS = -DLIBOPENMPT_BUILD -I$(srcdir)/build/svn_version -I$(srcdir)/ -I$(srcdir)/common $(ZLIB_CFLAGS) $(LTDL_CPPFLAGS)
 libopenmpt_la_CXXFLAGS = $(ZLIB_CFLAGS)
 libopenmpt_la_CFLAGS = $(ZLIB_CFLAGS)

Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/changelog.md	2014-11-10 11:39:10 UTC (rev 4584)
+++ trunk/OpenMPT/libopenmpt/dox/changelog.md	2014-11-10 12:39:42 UTC (rev 4585)
@@ -16,6 +16,8 @@
      *  GCC 4.1.x to 4.3.x (use `make ANCIENT=1`)
      *  Microsoft Visual Studio 2008 (with latest Service Pack)
         (see `build/vs2008`)
+ *  libopenmpt_ext.hpp is now distributed by default. The API is still
+    considered experimental and not guaranteed to stay API or ABI compatible.
 
  *  [Bug] The -autotools tarballs were not working at all.
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.