From a89e2362a0e98bea52f19e47986486a06044f140 Mon Sep 17 00:00:00 2001
From: timlyeee <timelyeee@gmail.com>
Date: Fri, 30 Dec 2022 11:55:13 +0800
Subject: [PATCH] wip

---
 android/CMakeLists.txt          | 10 +++++-----
 sources/CMakeLists.txt          | 12 ++++++------
 sources/LabSound/LabSound.cmake |  4 ++--
 win64/CMakeLists.txt            |  2 --
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index bc5cde9d..80f2c0fa 100644
--- a/android/CMakeLists.txt
+++ b/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}
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
index 8b9aeb31..a0deda09 100644
--- a/sources/CMakeLists.txt
+++ b/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
diff --git a/sources/LabSound/LabSound.cmake b/sources/LabSound/LabSound.cmake
index 12f6bd3b..dfc97991 100644
--- a/sources/LabSound/LabSound.cmake
+++ b/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
-)
\ No newline at end of file
+)
diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt
index 9bf2290a..88ecb0ab 100644
--- a/win64/CMakeLists.txt
+++ b/win64/CMakeLists.txt
@@ -261,8 +261,6 @@ list(APPEND CC_EXTERNAL_LIBS
     png
     ssl
     uv
-    vorbis
-    vorbisfile
     webp
     OpenAL32
     sqlite3