From 350be04ad63ed37d70f4ff2ea5cc56ce6da2f628 Mon Sep 17 00:00:00 2001 From: Tomasz Rudzki Date: Tue, 15 Jul 2025 19:34:24 +0100 Subject: [PATCH 1/2] Adds missing source files to the CMake config. Makes listing required source files more explicit. --- CMakeLists.txt | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe6103f..5389dc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,13 +49,31 @@ add_library(pffft STATIC # Collect all source files. file(GLOB SourceFiles CONFIGURE_DEPENDS - "${CMAKE_CURRENT_SOURCE_DIR}/obr/**/*.cc" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/**/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_binaural_decoder/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_binaural_decoder/*.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_binaural_decoder/binaural_filters/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_binaural_decoder/binaural_filters/*.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_encoder/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_encoder/*.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_rotator/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_rotator/*.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/audio_buffer/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/audio_buffer/*.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/common/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/common/*.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/peak_limiter/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/peak_limiter/*.cc" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/renderer/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/renderer/*.cc" + ) # Exclude the following files / directories. -list(FILTER SourceFiles EXCLUDE REGEX ".*test_util\\.(h|cc)") -list(FILTER SourceFiles EXCLUDE REGEX ".*/cli/.*") +list(REMOVE_ITEM SourceFiles + "${CMAKE_CURRENT_SOURCE_DIR}/obr/common/test_util.h" + "${CMAKE_CURRENT_SOURCE_DIR}/obr/common/test_util.cc" +) + # Define obr library target. add_library(obr STATIC) From 028880c5a1068075c16000d8cad869edaab1f075 Mon Sep 17 00:00:00 2001 From: Tomasz Rudzki Date: Wed, 23 Jul 2025 14:05:22 +0100 Subject: [PATCH 2/2] Lists manually source files in CMake config instead of using GLOB. --- CMakeLists.txt | 104 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 78 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5389dc9..9d4979b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,34 +47,86 @@ add_library(pffft STATIC ${pffft_SOURCE_DIR}/pffft.c ) -# Collect all source files. -file(GLOB SourceFiles CONFIGURE_DEPENDS - "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_binaural_decoder/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_binaural_decoder/*.cc" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_binaural_decoder/binaural_filters/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_binaural_decoder/binaural_filters/*.cc" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_encoder/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_encoder/*.cc" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_rotator/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/ambisonic_rotator/*.cc" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/audio_buffer/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/audio_buffer/*.cc" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/common/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/common/*.cc" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/peak_limiter/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/peak_limiter/*.cc" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/renderer/*.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/renderer/*.cc" - -) - -# Exclude the following files / directories. -list(REMOVE_ITEM SourceFiles - "${CMAKE_CURRENT_SOURCE_DIR}/obr/common/test_util.h" - "${CMAKE_CURRENT_SOURCE_DIR}/obr/common/test_util.cc" +# Manually list all source files. +set(SourceFiles + obr/ambisonic_binaural_decoder/ambisonic_binaural_decoder.cc + obr/ambisonic_binaural_decoder/ambisonic_binaural_decoder.h + obr/ambisonic_binaural_decoder/dsp_utils.cc + obr/ambisonic_binaural_decoder/dsp_utils.h + obr/ambisonic_binaural_decoder/fft_manager.cc + obr/ambisonic_binaural_decoder/fft_manager.h + obr/ambisonic_binaural_decoder/partitioned_fft_filter.cc + obr/ambisonic_binaural_decoder/partitioned_fft_filter.h + obr/ambisonic_binaural_decoder/planar_interleaved_conversion.cc + obr/ambisonic_binaural_decoder/planar_interleaved_conversion.h + obr/ambisonic_binaural_decoder/resampler.cc + obr/ambisonic_binaural_decoder/resampler.h + obr/ambisonic_binaural_decoder/sample_type_conversion.cc + obr/ambisonic_binaural_decoder/sample_type_conversion.h + obr/ambisonic_binaural_decoder/sh_hrir_creator.cc + obr/ambisonic_binaural_decoder/sh_hrir_creator.h + obr/ambisonic_binaural_decoder/wav.cc + obr/ambisonic_binaural_decoder/wav.h + obr/ambisonic_binaural_decoder/wav_reader.cc + obr/ambisonic_binaural_decoder/wav_reader.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_l.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_l.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_r.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_r.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_l.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_l.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_r.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_r.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_l.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_l.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_r.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_r.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_l.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_l.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_r.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_r.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_5_oa_l.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_5_oa_l.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_5_oa_r.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_5_oa_r.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_6_oa_l.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_6_oa_l.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_6_oa_r.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_6_oa_r.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_7_oa_l.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_7_oa_l.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_7_oa_r.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_7_oa_r.h + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_wrapper.cc + obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_wrapper.h + obr/ambisonic_encoder/ambisonic_encoder.cc + obr/ambisonic_encoder/ambisonic_encoder.h + obr/ambisonic_encoder/associated_legendre_polynomials_generator.cc + obr/ambisonic_encoder/associated_legendre_polynomials_generator.h + obr/ambisonic_rotator/ambisonic_rotator.cc + obr/ambisonic_rotator/ambisonic_rotator.h + obr/audio_buffer/audio_buffer.cc + obr/audio_buffer/audio_buffer.h + obr/audio_buffer/aligned_allocator.h + obr/audio_buffer/channel_view.cc + obr/audio_buffer/channel_view.h + obr/audio_buffer/simd_macros.h + obr/audio_buffer/simd_utils.cc + obr/audio_buffer/simd_utils.h + obr/common/ambisonic_utils.h + obr/common/constants.h + obr/common/misc_math.h + obr/peak_limiter/peak_limiter.cc + obr/peak_limiter/peak_limiter.h + obr/renderer/audio_element_config.cc + obr/renderer/audio_element_config.h + obr/renderer/audio_element_type.h + obr/renderer/input_channel_config.h + obr/renderer/loudspeaker_layouts.h + obr/renderer/obr_impl.cc + obr/renderer/obr_impl.h ) - # Define obr library target. add_library(obr STATIC)