wip

android/CMakeLists.txt

@@ -43,10 +43,10 @@ set_target_properties(libwavpack PROPERTIES
   IMPORTED_LOCATION ${platform_spec_path}/liblibwavpack.a
 )
 
-# add_library(libnyquist STATIC IMPORTED GLOBAL)
-# set_target_properties(libnyquist PROPERTIES
-#   IMPORTED_LOCATION ${platform_spec_path}/liblibnyquist.a
-# )
+add_library(libnyquist STATIC IMPORTED GLOBAL)
+set_target_properties(libnyquist PROPERTIES
+  IMPORTED_LOCATION ${platform_spec_path}/liblibnyquist.a
+)
 
 add_library(webp STATIC IMPORTED GLOBAL)
 set_target_properties(webp PROPERTIES
@@ -198,7 +198,7 @@ list(APPEND CC_EXTERNAL_LIBS
     webp
     uv
     libsamplerate
-    # libnyquist
+    libnyquist
     libwavpack
     android_platform
     ${PhysXSDK}

sources/CMakeLists.txt

@@ -70,13 +70,13 @@ endif()
 
 if(ANDROID OR OHOS OR NX)
 
-  # include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt)
-  # include(${CMAKE_CURRENT_LIST_DIR}/tremolo/CMakeLists.txt)
+  include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt)
+  include(${CMAKE_CURRENT_LIST_DIR}/tremolo/CMakeLists.txt)
 
-  # list(APPEND CC_EXTERNAL_LIBS
-  #   pvmp3dec
-  #   vorbisidec
-  # )
+  list(APPEND CC_EXTERNAL_LIBS
+    pvmp3dec
+    # vorbisidec
+  )
 
 elseif(WINDOWS)
   set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c PROPERTIES

sources/LabSound/LabSound.cmake

@@ -66,7 +66,7 @@ endif()
 # FFT
 if (APPLE)
     set(labsnd_fft_src "${LABSOUND_ROOT}/src/backends/FFTFrameAppleAcclerate.cpp")
-elseif (WIN32 OR LINUX)
+else()
     file(GLOB labsnd_fft_src "${LABSOUND_ROOT}/third_party/kissfft/src/*")
 endif()
 
@@ -98,4 +98,4 @@ list(APPEND LABSOUND_INCLUDE
     ${LABSOUND_ROOT}/third_party/ooura/src
     ${LABSOUND_ROOT}/third_party/kissfft/src
     ${LABSOUND_ROOT}/third_party/miniaudio
-)
+)

win64/CMakeLists.txt

@@ -261,8 +261,6 @@ list(APPEND CC_EXTERNAL_LIBS
     png
     ssl
     uv
-    vorbis
-    vorbisfile
     webp
     OpenAL32
     sqlite3