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

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

Revision: 3490
          http://sourceforge.net/p/modplug/code/3490
Author:   manxorist
Date:     2013-12-17 21:43:12 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
[Fix] openmpt123: Fix typo in UI.
[Doc] libopenmpt: Document libopenmpt_settings.dll dependency on .Net.
[Doc] libopenmpt build: Document makefile settings for linking dependencies.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/libopenmpt/dox/dependencies.md
    trunk/OpenMPT/openmpt123/openmpt123.cpp

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2013-12-17 20:44:47 UTC (rev 3489)
+++ trunk/OpenMPT/Makefile	2013-12-17 21:43:12 UTC (rev 3490)
@@ -40,10 +40,26 @@
 #  TEST=0           Build libopenmpt in test mode
 #
 #
+# Build flags for libopenmpt (provide on each `make` invocation)
+#  (defaults are 0):
+#
+#  NO_ZLIB=1        Avoid using zlib, even if found
+#
+#
+# Build flags for openmpt123 (provide on each `make` invocation)
+#
+#  (defaults are 0):
+#  USE_SDL=1        Use SDL (in addition to or in place of PortAudio)
+#  NO_PORTAUDIO=1   Avoid using PortAudio, even if found
+#  NO_FLAC=1        Avoid using FLAC, even if found
+#  NO_WAVPACK=1     Avoid using WavPack, even if found
+#  NO_SNDFILE=1     Avoid using libsndfile, even if found
+#
+#
 # Install options (provide on each `make install` invocation)
 #
-#  PREFIX   (e.g.: PREFIX=$HOME/opt, default: PREFIX=/usr/local)
-#  DESTDIR  (e.g.: DESTDIR=bin/dest, default: DESTDIR=)
+#  PREFIX   (e.g.:  PREFIX=$HOME/opt, default: PREFIX=/usr/local)
+#  DESTDIR  (e.g.:  DESTDIR=bin/dest, default: DESTDIR=)
 #
 #
 # Verbosity:
@@ -211,9 +227,6 @@
 LDLIBS_LIBOPENMPT  += -lopenmpt
 endif
 
-#CXXFLAGS += -mtune=generic
-#CFLAGS   += -mtune=generic
-
 ifeq ($(HOST),unix)
 
 ifeq ($(shell help2man --version > /dev/null 2>&1 && echo yes ),yes)

Modified: trunk/OpenMPT/libopenmpt/dox/dependencies.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/dependencies.md	2013-12-17 20:44:47 UTC (rev 3489)
+++ trunk/OpenMPT/libopenmpt/dox/dependencies.md	2013-12-17 21:43:12 UTC (rev 3490)
@@ -60,3 +60,7 @@
      *  **Win32** for WAVE
      *  raw PCM has no external dependencies
  *  **help2man** is required to build the documentation.
+
+### in_openmpt and xmp-openmpt
+
+ *  The **plugin configuration dialog** currently requires **Microsoft .NET Framework 4** on the user machine.

Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.cpp	2013-12-17 20:44:47 UTC (rev 3489)
+++ trunk/OpenMPT/openmpt123/openmpt123.cpp	2013-12-17 21:43:12 UTC (rev 3490)
@@ -1045,7 +1045,7 @@
 				log << "Gain: " << flags.gain * 0.01f << " dB" << "   ";
 				log << "Stereo: " << flags.separation << " %" << "   ";
 				log << "Filter: " << flags.filtertaps << " taps" << "   ";
-				log << "Ramping " << flags.ramping << "   ";
+				log << "Ramping: " << flags.ramping << "   ";
 				log  << std::endl;
 			}
 			if ( flags.show_details ) {

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