Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1451] trunk/OpenMPT
|
From: <sag...@us...> - 2012-12-09 20:55:14
|
Revision: 1451
http://sourceforge.net/p/modplug/code/1451
Author: saga-games
Date: 2012-12-09 20:55:07 +0000 (Sun, 09 Dec 2012)
Log Message:
-----------
More small changes to the flac projects and readmes.
Modified Paths:
--------------
trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_08.vcproj
trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj
trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj.filters
trunk/OpenMPT/installer/packageTemplate/readme.txt
trunk/OpenMPT/packageTemplate/readme.txt
Added Paths:
-----------
trunk/OpenMPT/include/flac/OpenMPT.txt
Added: trunk/OpenMPT/include/flac/OpenMPT.txt
===================================================================
--- trunk/OpenMPT/include/flac/OpenMPT.txt (rev 0)
+++ trunk/OpenMPT/include/flac/OpenMPT.txt 2012-12-09 20:55:07 UTC (rev 1451)
@@ -0,0 +1,16 @@
+The FLAC package has been left pretty much untouched, except for a few changes:
+- Obviously, unnecessary folders and files (documentation, makefiles, etc.) have
+ been removed.
+- The existing libFLAC_static project files have been upgraded to VS2008 and
+ VS2010. The following changes have been made:
+ - Output directory for the library has been changed to ..\..\lib\
+ - Output filename has been changed to ..\..\lib\libFLAC_staticd.lib (debug)
+ and ..\..\lib\libFLAC_static.lib (release).
+ - ASM files and nasm.h have been excluded from the project to be able to
+ compile without NASM.
+ - *ogg*.c/h files have been excluded from the project to be able to compile
+ without libvorbis.
+ - The following preprocessor directives have been removed from both debug
+ and release configurations: FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM
+ - Debug configurations have been changed to use a multi-threaded debug DLL
+ runtime library (/MDd)
\ No newline at end of file
Modified: trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_08.vcproj
===================================================================
--- trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_08.vcproj 2012-12-09 17:34:34 UTC (rev 1450)
+++ trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_08.vcproj 2012-12-09 20:55:07 UTC (rev 1451)
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__HAS_NASM;FLAC__USE_3DNOW;VERSION=\"1.2.0\";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLAC__USE_3DNOW;VERSION=\"1.2.0\";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -214,26 +214,6 @@
>
</File>
<File
- RelativePath=".\ia32\nasm.h"
- >
- </File>
- <File
- RelativePath=".\include\private\ogg_decoder_aspect.h"
- >
- </File>
- <File
- RelativePath=".\include\private\ogg_encoder_aspect.h"
- >
- </File>
- <File
- RelativePath=".\include\private\ogg_helper.h"
- >
- </File>
- <File
- RelativePath=".\include\private\ogg_mapping.h"
- >
- </File>
- <File
RelativePath=".\include\protected\stream_decoder.h"
>
</File>
Modified: trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj
===================================================================
--- trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj 2012-12-09 17:34:34 UTC (rev 1450)
+++ trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj 2012-12-09 20:55:07 UTC (rev 1451)
@@ -95,11 +95,6 @@
<ClInclude Include="include\private\md5.h" />
<ClInclude Include="include\private\memory.h" />
<ClInclude Include="include\private\metadata.h" />
- <ClInclude Include="ia32\nasm.h" />
- <ClInclude Include="include\private\ogg_decoder_aspect.h" />
- <ClInclude Include="include\private\ogg_encoder_aspect.h" />
- <ClInclude Include="include\private\ogg_helper.h" />
- <ClInclude Include="include\private\ogg_mapping.h" />
<ClInclude Include="include\protected\stream_decoder.h" />
<ClInclude Include="include\protected\stream_encoder.h" />
<ClInclude Include="include\private\stream_encoder_framing.h" />
Modified: trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj.filters 2012-12-09 17:34:34 UTC (rev 1450)
+++ trunk/OpenMPT/include/flac/src/libFLAC/libFLAC_static_10.vcxproj.filters 2012-12-09 20:55:07 UTC (rev 1451)
@@ -56,21 +56,6 @@
<ClInclude Include="include\private\metadata.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="ia32\nasm.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="include\private\ogg_decoder_aspect.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="include\private\ogg_encoder_aspect.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="include\private\ogg_helper.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="include\private\ogg_mapping.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="include\protected\stream_decoder.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt 2012-12-09 17:34:34 UTC (rev 1450)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt 2012-12-09 20:55:07 UTC (rev 1451)
@@ -16,6 +16,8 @@
An uninstaller is provided. Don't worry, it will ask you if you want to keep
your personal settings, none of these will be deleted automatically.
+Custom files that are created by the user (e.g. key bindings) will never be
+removed.
Changes
@@ -32,8 +34,8 @@
tracker at http://bugs.openmpt.org/
-Release package contents:
--------------------------
+Release package contents
+------------------------
extraKeymaps (folder): Additional key bindings for the keyboard manager,
available in several flavours (including MPT classic, Fasttracker 2 and
Impulse Tracker) and country-specific layouts.
@@ -51,8 +53,8 @@
unmo3.dll: Used in MO3-file import.
OMPT_1.20_ReleaseNotes.html: Release notes for this version.
-Misc:
------
+License
+-------
OpenMPT is partially under the following license:
@@ -88,9 +90,11 @@
For more information about SoundTouch, see folder SoundTouch.
+PortMidi
+--------
OpenMPT's MIDI plugins make use of the PortMidi library, which is released under
the MIT license.
-Visit https://sourceforge.net/projects/portmedia/ for more information.
+Visit http://portmedia.sourceforge.net/ for more information.
unmo3.dll
---------
@@ -100,8 +104,45 @@
charge you for it, kick 'em where it hurts!
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED "AS
-IS", WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT
+IS", WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT
NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD LIABLE FOR ANY DAMAGE THAT MAY
RESULT FROM THE USE OF THIS SOFTWARE. YOU USE THIS SOFTWARE ENTIRELY AT YOUR OWN
-RISK.
+RISK.
+
+Visit http://www.un4seen.com/mo3.html for more information.
+
+libFLAC
+-------
+OpenMPT makes use of libFLAC, which is released under the BSD license:
+
+Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Visit http://flac.sourceforge.net/ for more information.
Modified: trunk/OpenMPT/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/readme.txt 2012-12-09 17:34:34 UTC (rev 1450)
+++ trunk/OpenMPT/packageTemplate/readme.txt 2012-12-09 20:55:07 UTC (rev 1451)
@@ -49,8 +49,8 @@
tracker at http://bugs.openmpt.org/
-Release package contents:
--------------------------
+Release package contents
+------------------------
extraKeymaps (folder): Additional key bindings for the keyboard manager,
available in several flavours (including MPT classic, Fasttracker 2 and
Impulse Tracker) and country-specific layouts.
@@ -70,8 +70,8 @@
OMPT_1.20_ReleaseNotes.html: Release notes for this version.
-Misc:
------
+License
+-------
OpenMPT is partially under the following license:
@@ -107,9 +107,11 @@
For more information about SoundTouch, see folder SoundTouch.
+PortMidi
+--------
OpenMPT's MIDI plugins make use of the PortMidi library, which is released under
the MIT license.
-Visit https://sourceforge.net/projects/portmedia/ for more information.
+Visit http://portmedia.sourceforge.net/ for more information.
unmo3.dll
---------
@@ -123,4 +125,41 @@
NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD LIABLE FOR ANY DAMAGE THAT MAY
RESULT FROM THE USE OF THIS SOFTWARE. YOU USE THIS SOFTWARE ENTIRELY AT YOUR OWN
-RISK.
+RISK.
+
+Visit http://www.un4seen.com/mo3.html for more information.
+
+libFLAC
+-------
+OpenMPT makes use of libFLAC, which is released under the BSD license:
+
+Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Visit http://flac.sourceforge.net/ for more information.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
