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

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

Revision: 3330
          http://sourceforge.net/p/modplug/code/3330
Author:   manxorist
Date:     2013-11-29 02:53:15 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
[Ref] libopenmpt: Remove NO_WINAMP, NO_XMPLAY and NO_LIBMODPLUG from BuildSettings.h .

Modified Paths:
--------------
    trunk/OpenMPT/README
    trunk/OpenMPT/common/BuildSettings.h
    trunk/OpenMPT/libopenmpt/libopenmpt_internal.h

Modified: trunk/OpenMPT/README
===================================================================
--- trunk/OpenMPT/README	2013-11-29 02:02:31 UTC (rev 3329)
+++ trunk/OpenMPT/README	2013-11-29 02:53:15 UTC (rev 3330)
@@ -38,12 +38,12 @@
       Winamp/ from WA5.55_SDK.exe to include/winamp/.
       Please visit http://wiki.winamp.com/wiki/Plug-in_Developer to download
       the SDK.
-      Use #define NO_WINAMP in common/BuildSettings.h to disable.
+      Exclude libopenmpt_winamp.cpp from build to disable.
     - xmplay SDK:
       To build libopenmpt with xmplay input plugin support, copy the contents
       of xmp-sdk.zip into include/xmplay/.
       Please visit http://www.un4seen.com/xmplay.html to download to SDK.
-      Use #define NO_XMPLAY in common/BuildSettings.h to disable.
+      Exclude libopenmpt_xmplay.cpp from build to disable.
   - The openmpt123 solution is in openmpt123/openmpt123.sln.
 - Makefile
   The makefile resides in openmpt123/Makefile. You should cd into openmpt123

Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h	2013-11-29 02:02:31 UTC (rev 3329)
+++ trunk/OpenMPT/common/BuildSettings.h	2013-11-29 02:53:15 UTC (rev 3330)
@@ -123,15 +123,6 @@
 // Define to build without MP3 import support (via mpg123)
 //#define NO_MP3_SAMPLES
 
-// Do not build libmodplug emulation layer (only makes sense for library)
-#define NO_LIBMODPLUG
-
-// Do not build xmplay input plugin code (only makes sense for library)
-#define NO_XMPLAY
-
-// Do not build winamp input plugin code (only makes sense for library)
-#define NO_WINAMP
-
 // Do not build libopenmpt C api
 #define NO_LIBOPENMPT_C
 
@@ -168,15 +159,6 @@
 #endif
 //#define NO_MINIZ
 #define NO_MP3_SAMPLES
-#if defined(LIBOPENMPT_BUILD_TEST)
-#define NO_LIBMODPLUG
-#endif
-#if !defined(_WIN32) || (defined(_WIN32) && !defined(_M_IX86)) || defined(LIBOPENMPT_BUILD_TEST)
-#define NO_WINAMP
-#endif
-#if !defined(_WIN32) || (defined(_WIN32) && !defined(_M_IX86)) || defined(LIBOPENMPT_BUILD_TEST)
-#define NO_XMPLAY
-#endif
 //#define NO_LIBOPENMPT_C
 //#define NO_LIBOPENMPT_CXX
 
@@ -216,26 +198,8 @@
 #define MODPLUG_NO_FILESAVE // file saving is broken on big endian
 #endif
 
-#if !defined(NO_LIBMODPLUG)
-#if !defined(LIBOPENMPT_BUILD) || (defined(LIBOPENMPT_BUILD) && defined(_WIN32) && !defined(LIBOPENMPT_BUILD_DLL))
-#define NO_LIBMODPLUG // libmodplug interface emulation requires libopenmpt dll build on windows
-#endif
-#endif
 
-#if !defined(NO_WINAMP)
-#if !defined(LIBOPENMPT_BUILD) || (defined(LIBOPENMPT_BUILD) && !defined(LIBOPENMPT_BUILD_DLL))
-#define NO_WINAMP // winamp plugin requires libopenmpt dll build
-#endif
-#endif
 
-#if !defined(NO_XMPLAY)
-#if !defined(LIBOPENMPT_BUILD) || (defined(LIBOPENMPT_BUILD) && !defined(LIBOPENMPT_BUILD_DLL))
-#define NO_XMPLAY // xmplay plugin requires libopenmpt dll build
-#endif
-#endif
-
-
-
 #if MPT_COMPILER_MSVC
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 #endif

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_internal.h
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_internal.h	2013-11-29 02:02:31 UTC (rev 3329)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_internal.h	2013-11-29 02:53:15 UTC (rev 3330)
@@ -25,10 +25,7 @@
 #ifdef __cplusplus
 #if defined(LIBOPENMPT_BUILD_DLL) || defined(LIBOPENMPT_USE_DLL)
 #if defined(_MSC_VER) && !defined(_DLL)
-#if defined(NO_LIBMODPLUG) && defined(NO_WINAMP) && defined(NO_XMPLAY)
-/* do not warn if building libmodplug emulation or winamp plugin or xmplay plugin */
-#pragma message( "libopenmpt C++ interface is disabled if libopenmpt is built as a DLL and the runtime is statically linked. This is not supported by microsoft and cannot possibly work. Ever." )
-#endif
+/* #pragma message( "libopenmpt C++ interface is disabled if libopenmpt is built as a DLL and the runtime is statically linked. This is not supported by microsoft and cannot possibly work. Ever." ) */
 #undef LIBOPENMPT_CXX_API
 #define LIBOPENMPT_CXX_API LIBOPENMPT_API_HELPER_LOCAL
 #endif

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