build: make Android NDK build happy

CMakeLists.txt

@@ -1,29 +1,37 @@
-cmake_minimum_required(VERSION 4.1)
+cmake_minimum_required(VERSION 3.22.1)
 project(rubberband)
 
 set(CMAKE_CXX_STANDARD 20)
 
-set(CMAKE_CXX_FLAGS "-DNOMINMAX -DUSE_BQRESAMPLER -DHAVE_KISSFFT")
+# -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)
 
-#include_directories(mpg123/lib/x86_64/include)
 include_directories(
-./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
 )
 
-add_executable(rubberband
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-./src/ext/getopt/getopt.c
+    # only for WIN32 target system
-./src/ext/getopt/getopt_long.c
+    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
@@ -53,9 +61,11 @@ add_executable(rubberband
     ./src/RubberBandLiveShifter.cpp
     ./src/RubberBandStretcher.cpp
 )
-#target_link_directories(rubberband PRIVATE mpg123/lib/x86_64)
+
-#target_link_libraries(test_lockstep mpg123-0)
+add_executable(rubberband-main ${RUBBERBAND_SRC})
-#target_link_libraries(rubberband ${CMAKE_SOURCE_DIR}/mpg123/lib/x86_64/libmpg123.dll.a)
+
+add_library(rubberband SHARED ${RUBBERBAND_SRC})
 
 add_subdirectory(src/ext/libsndfile)
+target_link_libraries(rubberband-main sndfile)
 target_link_libraries(rubberband sndfile)

src/common/VectorOpsComplex.cpp

@@ -23,7 +23,7 @@
 
 #include "VectorOpsComplex.h"
 
-#include "system/sysutils.h"
+//#include "system/sysutils.h"
 
 #include <cassert>
 

src/ext/getopt/getopt.c

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

src/ext/getopt/getopt.h

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

src/ext/getopt/getopt_long.c

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