This commit is contained in:
timlyeee 2022-12-30 11:55:13 +08:00
parent bcbfdf4bc6
commit a89e2362a0
4 changed files with 13 additions and 15 deletions

View File

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

View File

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

View File

@ -66,7 +66,7 @@ endif()
# FFT # FFT
if (APPLE) if (APPLE)
set(labsnd_fft_src "${LABSOUND_ROOT}/src/backends/FFTFrameAppleAcclerate.cpp") 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/*") file(GLOB labsnd_fft_src "${LABSOUND_ROOT}/third_party/kissfft/src/*")
endif() endif()
@ -98,4 +98,4 @@ list(APPEND LABSOUND_INCLUDE
${LABSOUND_ROOT}/third_party/ooura/src ${LABSOUND_ROOT}/third_party/ooura/src
${LABSOUND_ROOT}/third_party/kissfft/src ${LABSOUND_ROOT}/third_party/kissfft/src
${LABSOUND_ROOT}/third_party/miniaudio ${LABSOUND_ROOT}/third_party/miniaudio
) )

View File

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