From 7df5617a4bb694cbc3f61199a0015d4d13eab0a5 Mon Sep 17 00:00:00 2001
From: Olli <oparviai'at'iki.fi>
Date: Wed, 1 Sep 2021 18:46:54 +0300
Subject: [PATCH] cmake: remove "CMAKE" compiler definition and instead add
 mock "soundtouch_config.h"

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>
---
 CMakeLists.txt                        | 6 +++---
 README.html                           | 6 +++++-
 configure.ac                          | 2 +-
 include/STTypes.h                     | 2 +-
 include/SoundTouch.h                  | 4 ++--
 include/soundtouch_config.h           | 3 +++
 readme.md                             | 2 +-
 source/SoundTouchDLL/SoundTouchDLL.rc | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 include/soundtouch_config.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f1108b..df29e02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,13 @@
 cmake_minimum_required(VERSION 3.1)
-project(SoundTouch VERSION 2.3.0 LANGUAGES CXX)
+project(SoundTouch VERSION 2.3.1 LANGUAGES CXX)
 
 include(GNUInstallDirs)
 
 if(MSVC)
-  set(COMPILE_DEFINITIONS CMAKE /O2 /fp:fast)
+  set(COMPILE_DEFINITIONS /O2 /fp:fast)
   set(COMPILE_OPTIONS )
 else()
   set(COMPILE_OPTIONS -Ofast)
-  set(COMPILE_DEFINITIONS CMAKE)
 endif()
 
 #####################
@@ -79,6 +78,7 @@ install(
     include/FIFOSamplePipe.h
     include/STTypes.h
     include/SoundTouch.h
+    include/soundtouch_config.h
   DESTINATION
     "${CMAKE_INSTALL_INCLUDEDIR}/soundtouch"
 )
diff --git a/README.html b/README.html
index f864f50..1efe7a6 100644
--- a/README.html
+++ b/README.html
@@ -15,7 +15,7 @@
 
 <body class="normal">
   <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>
   <hr>
   <h2>1. Introduction </h2>
@@ -603,6 +603,10 @@
     <hr>
     <h2>5. Change History</h2>
     <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>
     <ul>
       <li>Disable setting "SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION" by default. The original
diff --git a/configure.ac b/configure.ac
index 364c1f8..d557fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
 # 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
 LIB_SONAME=1
 AC_SUBST(LIB_SONAME)
diff --git a/include/STTypes.h b/include/STTypes.h
index e846dfe..71dd0eb 100644
--- a/include/STTypes.h
+++ b/include/STTypes.h
@@ -47,7 +47,7 @@ typedef unsigned long   ulong;
 #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.
     // Skip this in Android compilation that uses GCC but without configure scripts.
     #include "soundtouch_config.h"
diff --git a/include/SoundTouch.h b/include/SoundTouch.h
index d336a17..778fc03 100644
--- a/include/SoundTouch.h
+++ b/include/SoundTouch.h
@@ -72,10 +72,10 @@ namespace soundtouch
 {
 
 /// Soundtouch library version string
-#define SOUNDTOUCH_VERSION          "2.3.0"
+#define SOUNDTOUCH_VERSION          "2.3.1"
 
 /// SoundTouch library version id
-#define SOUNDTOUCH_VERSION_ID       (20300)
+#define SOUNDTOUCH_VERSION_ID       (20301)
 
 //
 // Available setting IDs for the 'setSetting' & 'get_setting' functions:
diff --git a/include/soundtouch_config.h b/include/soundtouch_config.h
new file mode 100644
index 0000000..3942afe
--- /dev/null
+++ b/include/soundtouch_config.h
@@ -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
diff --git a/readme.md b/readme.md
index 6e91602..0e900c8 100644
--- a/readme.md
+++ b/readme.md
@@ -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.
 
-### The latest stable release is 2.3.0
+### The latest stable release is 2.3.1
 
 ## Example
 
diff --git a/source/SoundTouchDLL/SoundTouchDLL.rc b/source/SoundTouchDLL/SoundTouchDLL.rc
index 8f0d1af..3656ad2 100644
--- a/source/SoundTouchDLL/SoundTouchDLL.rc
+++ b/source/SoundTouchDLL/SoundTouchDLL.rc
@@ -69,12 +69,12 @@ 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 "FileDescription", "SoundTouch Dynamic Link Library"
-            VALUE "FileVersion", "2.3.0.0"
+            VALUE "FileVersion", "2.3.1.0"
             VALUE "InternalName", "SoundTouch"
             VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 2021"
             VALUE "OriginalFilename", "SoundTouch.dll"
             VALUE "ProductName", " SoundTouch Dynamic Link Library"
-            VALUE "ProductVersion", "2.3.0.0"
+            VALUE "ProductVersion", "2.3.1.0"
         END
     END
     BLOCK "VarFileInfo"
