RPCS3/soundtouch
1
0
Fork 0
mirror of https://github.com/RPCS3/soundtouch.git synced 2024-11-08 12:02:28 +01:00
Code Issues Projects Releases Wiki Activity

cmake: remove "CMAKE" compiler definition and instead add mock "soundtouch_config.h"

Browse Source 
Add a empty mock "soundtouch_config.h" file and remove "CMAKE" compiler
definition that was used in #ifdef that skipped including
"soundtouch_config.h" in cmake build.

This is to avoid errors about missing include file when not using
autotools build.

Also update version to 2.3.1

Signed-off-by: Olli <oparviai'at'iki.fi>
This commit is contained in:
Olli 2021-09-01 18:46:54 +03:00
parent 2e606befef
commit 7df5617a4b
8 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1,14 +1,13 @@
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
project(SoundTouch VERSION 2.3.0 LANGUAGES CXX) project(SoundTouch VERSION 2.3.1 LANGUAGES CXX)
include(GNUInstallDirs) include(GNUInstallDirs)
if(MSVC) if(MSVC)
set(COMPILE_DEFINITIONS CMAKE /O2 /fp:fast) set(COMPILE_DEFINITIONS /O2 /fp:fast)
set(COMPILE_OPTIONS ) set(COMPILE_OPTIONS )
else() else()
set(COMPILE_OPTIONS -Ofast) set(COMPILE_OPTIONS -Ofast)
set(COMPILE_DEFINITIONS CMAKE)
endif() endif()
##################### #####################
@ -79,6 +78,7 @@ install(
include/FIFOSamplePipe.h include/FIFOSamplePipe.h
include/STTypes.h include/STTypes.h
include/SoundTouch.h include/SoundTouch.h
include/soundtouch_config.h
DESTINATION DESTINATION
"${CMAKE_INSTALL_INCLUDEDIR}/soundtouch" "${CMAKE_INSTALL_INCLUDEDIR}/soundtouch"
) )

6
README.html
View File

@ -15,7 +15,7 @@
<body class="normal"> <body class="normal">
<hr> <hr>
<h1>SoundTouch audio processing library v2.3.0</h1> <h1>SoundTouch audio processing library v2.3.1</h1>
<p class="normal">SoundTouch library Copyright &copy; Olli Parviainen 2001-2021</p> <p class="normal">SoundTouch library Copyright &copy; Olli Parviainen 2001-2021</p>
<hr> <hr>
<h2>1. Introduction </h2> <h2>1. Introduction </h2>
@ -603,6 +603,10 @@
<hr> <hr>
<h2>5. Change History</h2> <h2>5. Change History</h2>
<h3>5.1. SoundTouch library Change History </h3> <h3>5.1. SoundTouch library Change History </h3>
<p><b>2.3.1:</b></p>
<ul>
<li>Adjusted cmake build settings and header files that cmake installs</li>
</ul>
<p><b>2.3.0:</b></p> <p><b>2.3.0:</b></p>
<ul> <ul>
<li>Disable setting "SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION" by default. The original <li>Disable setting "SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION" by default. The original

2
configure.ac
View File

@ -15,7 +15,7 @@ dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
dnl Place - Suite 330, Boston, MA 02111-1307, USA dnl Place - Suite 330, Boston, MA 02111-1307, USA
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_INIT([SoundTouch], [2.3.0], [http://www.surina.net/soundtouch]) AC_INIT([SoundTouch], [2.3.1], [http://www.surina.net/soundtouch])
dnl Default to libSoundTouch.so.$LIB_SONAME.0.0 dnl Default to libSoundTouch.so.$LIB_SONAME.0.0
LIB_SONAME=1 LIB_SONAME=1
AC_SUBST(LIB_SONAME) AC_SUBST(LIB_SONAME)

2
include/STTypes.h
View File

@ -47,7 +47,7 @@ typedef unsigned long ulong;
#define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 ) #define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
#if (defined(__GNUC__) && !defined(ANDROID) && !defined(CMAKE)) #if (defined(__GNUC__) && !defined(ANDROID))
// In GCC, include soundtouch_config.h made by config scritps. // In GCC, include soundtouch_config.h made by config scritps.
// Skip this in Android compilation that uses GCC but without configure scripts. // Skip this in Android compilation that uses GCC but without configure scripts.
#include "soundtouch_config.h" #include "soundtouch_config.h"

4
include/SoundTouch.h
View File

@ -72,10 +72,10 @@ namespace soundtouch
{ {
/// Soundtouch library version string /// Soundtouch library version string
#define SOUNDTOUCH_VERSION "2.3.0" #define SOUNDTOUCH_VERSION "2.3.1"
/// SoundTouch library version id /// SoundTouch library version id
#define SOUNDTOUCH_VERSION_ID (20300) #define SOUNDTOUCH_VERSION_ID (20301)
// //
// Available setting IDs for the 'setSetting' & 'get_setting' functions: // Available setting IDs for the 'setSetting' & 'get_setting' functions:

3
include/soundtouch_config.h Normal file
View File

@ -0,0 +1,3 @@
// autotools configuration step replaces this file with a configured version.
// this empty file stub is provided to avoid error about missing include file
// when not using autotools build

2
readme.md
View File

@ -9,7 +9,7 @@ same time
Visit [SoundTouch website](https://www.surina.net/soundtouch) and see the [README file](README.html) for more information and audio examples. Visit [SoundTouch website](https://www.surina.net/soundtouch) and see the [README file](README.html) for more information and audio examples.
### The latest stable release is 2.3.0 ### The latest stable release is 2.3.1
## Example ## Example

4
source/SoundTouchDLL/SoundTouchDLL.rc
View File

@ -69,12 +69,12 @@ BEGIN
BEGIN BEGIN
VALUE "Comments", "SoundTouch Library licensed for 3rd party applications subject to LGPL license v2.1. Visit http://www.surina.net/soundtouch for more information about the SoundTouch library." VALUE "Comments", "SoundTouch Library licensed for 3rd party applications subject to LGPL license v2.1. Visit http://www.surina.net/soundtouch for more information about the SoundTouch library."
VALUE "FileDescription", "SoundTouch Dynamic Link Library" VALUE "FileDescription", "SoundTouch Dynamic Link Library"
VALUE "FileVersion", "2.3.0.0" VALUE "FileVersion", "2.3.1.0"
VALUE "InternalName", "SoundTouch" VALUE "InternalName", "SoundTouch"
VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 2021" VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 2021"
VALUE "OriginalFilename", "SoundTouch.dll" VALUE "OriginalFilename", "SoundTouch.dll"
VALUE "ProductName", " SoundTouch Dynamic Link Library" VALUE "ProductName", " SoundTouch Dynamic Link Library"
VALUE "ProductVersion", "2.3.0.0" VALUE "ProductVersion", "2.3.1.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"