build: simple build using CMake (manually add src/ext/libsndfile)

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/ext/libsndfile"]
-	path = src/ext/libsndfile
-	url = https://github.com/libsndfile/libsndfile.git

CMakeLists.txt

@@ -1,71 +1,61 @@
-cmake_minimum_required(VERSION 3.22.1)
+cmake_minimum_required(VERSION 4.1)
 project(rubberband)
 
 set(CMAKE_CXX_STANDARD 20)
 
-# -DNOMINMAX: for MSVCC to avoid defining max() as macro, breaking std::max()
-# -DHAVE_UNISTD_H: for libsndfile access()
-# -DUSE_PTHREADS: for Thread.h
-set(CMAKE_CXX_FLAGS "-DNOMINMAX -DHAVE_UNISTD_H -DUSE_PTHREADS -DUSE_BQRESAMPLER -DHAVE_KISSFFT")
-
-# disable libsndfile tests
-set(BUILD_TESTING FALSE)
+set(CMAKE_CXX_FLAGS "-DUSE_BQRESAMPLER -DHAVE_KISSFFT")
 
+#include_directories(mpg123/lib/x86_64/include)
 include_directories(
-    ./rubberband
-    ./src/common
-    ./src/ext/float_cast
-    ./src/ext/kissfft
-    ./src/ext/pommier
-    ./src/ext/speex
-    ./src/faster
-    ./src/finer
+./dotnet/rubberband-dll
+./ladspa-lv2
+./rubberband
+./src/common
+./src/ext/float_cast
+./src/ext/getopt
+./src/ext/kissfft
+./src/ext/pommier
+./src/ext/speex
+./src/faster
+./src/finer
+./vamp
 )
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    # only for WIN32 target system
-    include_directories(
-        ./src/ext/getopt
-    )
-endif()
-
-set(RUBBERBAND_SRC
-    #./src/ext/getopt/getopt.c
-    #./src/ext/getopt/getopt_long.c
-    ./src/ext/kissfft/kiss_fft.c
-    ./src/ext/kissfft/kiss_fftr.c
-    ./src/ext/speex/resample.c
-    ./main/main.cpp
-    ./src/common/Allocators.cpp
-    ./src/common/BQResampler.cpp
-    ./src/common/FFT.cpp
-    ./src/common/Log.cpp
-    ./src/common/mathmisc.cpp
-    ./src/common/Profiler.cpp
-    ./src/common/Resampler.cpp
-    ./src/common/StretchCalculator.cpp
-    ./src/common/sysutils.cpp
-    ./src/common/Thread.cpp
-    ./src/common/VectorOpsComplex.cpp
-    ./src/faster/AudioCurveCalculator.cpp
-    ./src/faster/CompoundAudioCurve.cpp
-    ./src/faster/HighFrequencyAudioCurve.cpp
-    ./src/faster/PercussiveAudioCurve.cpp
-    ./src/faster/R2Stretcher.cpp
-    ./src/faster/SilentAudioCurve.cpp
-    ./src/faster/StretcherChannelData.cpp
-    ./src/faster/StretcherProcess.cpp
-    ./src/finer/R3LiveShifter.cpp
-    ./src/finer/R3Stretcher.cpp
-    ./src/rubberband-c.cpp
-    ./src/RubberBandLiveShifter.cpp
-    ./src/RubberBandStretcher.cpp
+add_executable(rubberband
+./src/ext/getopt/getopt.c
+./src/ext/getopt/getopt_long.c
+./src/ext/kissfft/kiss_fft.c
+./src/ext/kissfft/kiss_fftr.c
+./src/ext/speex/resample.c
+./main/main.cpp
+./src/common/Allocators.cpp
+./src/common/BQResampler.cpp
+./src/common/FFT.cpp
+./src/common/Log.cpp
+./src/common/mathmisc.cpp
+./src/common/Profiler.cpp
+./src/common/Resampler.cpp
+./src/common/StretchCalculator.cpp
+./src/common/sysutils.cpp
+./src/common/Thread.cpp
+./src/common/VectorOpsComplex.cpp
+./src/faster/AudioCurveCalculator.cpp
+./src/faster/CompoundAudioCurve.cpp
+./src/faster/HighFrequencyAudioCurve.cpp
+./src/faster/PercussiveAudioCurve.cpp
+./src/faster/R2Stretcher.cpp
+./src/faster/SilentAudioCurve.cpp
+./src/faster/StretcherChannelData.cpp
+./src/faster/StretcherProcess.cpp
+./src/finer/R3LiveShifter.cpp
+./src/finer/R3Stretcher.cpp
+./src/rubberband-c.cpp
+./src/RubberBandLiveShifter.cpp
+./src/RubberBandStretcher.cpp
 )
-
-add_executable(rubberband-main ${RUBBERBAND_SRC})
-
-add_library(rubberband SHARED ${RUBBERBAND_SRC})
+#target_link_directories(rubberband PRIVATE mpg123/lib/x86_64)
+#target_link_libraries(test_lockstep mpg123-0)
+#target_link_libraries(rubberband ${CMAKE_SOURCE_DIR}/mpg123/lib/x86_64/libmpg123.dll.a)
 
 add_subdirectory(src/ext/libsndfile)
-target_link_libraries(rubberband-main sndfile)
 target_link_libraries(rubberband sndfile)

main/main.cpp

@@ -49,6 +49,7 @@ using RubberBand::gettimeofday;
 #endif
 
 #ifdef _MSC_VER
+#define NOMINMAX
 #include <windows.h>
 static void usleep(unsigned long usec) {
     ::Sleep(usec == 0 ? 0 : usec < 1000 ? 1 : usec / 1000);

src/RubberBandStretcher.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library

src/common/BQResampler.cpp

@@ -20,6 +20,7 @@
     under terms other than those of the GNU General Public License,
     you must obtain a valid commercial licence before doing so.
 */
+#define NOMINMAX
 
 #include "BQResampler.h"
 

src/common/Resampler.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library

src/common/sysutils.cpp

@@ -24,6 +24,7 @@
 #include "sysutils.h"
 
 #ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #include <fcntl.h>
 #include <io.h>

src/ext/getopt/getopt.c

@@ -31,8 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#if OS_IS_WIN32
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -116,5 +114,3 @@ getopt(nargc, nargv, ostr)
 	}
 	return (optopt);			/* dump back option letter */
 }
-
-#endif

src/ext/getopt/getopt.h

@@ -61,8 +61,6 @@
 # if !defined(GETOPT_API)
 #  define GETOPT_API __declspec(dllimport)
 # endif
-#else
-# define GETOPT_API
 #endif
 
 /*

src/ext/getopt/getopt_long.c

@@ -37,7 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if OS_IS_WIN32
 
 #include <stdlib.h>
 #include <string.h>
@@ -550,5 +549,3 @@ getopt_long(nargc, nargv, options, long_options, idx)
 	return retval;
 }
 #endif /* !GETOPT_LONG */
-
-#endif

src/faster/R2Stretcher.cpp

@@ -1,5 +1,7 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
+#define NOMINMAX
+
 /*
     Rubber Band Library
     An audio time-stretching and pitch-shifting library.

src/faster/StretcherChannelData.cpp

@@ -20,6 +20,7 @@
     under terms other than those of the GNU General Public License,
     you must obtain a valid commercial licence before doing so.
 */
+#define NOMINMAX
 
 #include "StretcherChannelData.h"
 
@@ -27,6 +28,9 @@
 #include "../common/Allocators.h"
 
 #include <algorithm>
+#include <utility>
+
+using std::max;
 
 namespace RubberBand 
 {
@@ -114,7 +118,7 @@ void
 R2Stretcher::ChannelData::setSizes(size_t windowSize,
                                    size_t fftSize)
 {
-    size_t maxSize = 2 * std::max(windowSize, fftSize);
+    size_t maxSize = 2*std::max(windowSize, fftSize);
     size_t realSize = maxSize / 2 + 1;
     size_t oldMax = inbuf->getSize();
     size_t oldReal = oldMax / 2 + 1;

src/faster/StretcherProcess.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library

src/finer/R3LiveShifter.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library

src/finer/R3Stretcher.cpp

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+#define NOMINMAX
 
 /*
     Rubber Band Library