diff options
| author | Daniil Cherednik <dan.cherednik@gmail.com> | 2024-07-06 20:00:45 +0000 |
|---|---|---|
| committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2024-07-06 20:00:45 +0000 |
| commit | 66f8608f05f32b94e1cc25c21a0c80ea98ecaeb1 (patch) | |
| tree | 4c8beb65135305908eebb8d32d455bcc3543e3f2 | |
| parent | 1d99ba9937d6588f4b00dc3766e165e9e3ff834d (diff) | |
| parent | 3a0dfee28fe24811e4f14a5538ecfa0b09698bd8 (diff) | |
| download | atracdenc-66f8608f05f32b94e1cc25c21a0c80ea98ecaeb1.tar.gz | |
Merge branch 'master' into at3plus-dev
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/lib/fft/kissfft_impl/_kiss_fft_guts.h (renamed from src/fft/kissfft_impl/_kiss_fft_guts.h) | 0 | ||||
| -rw-r--r-- | src/lib/fft/kissfft_impl/kiss_fft.c (renamed from src/fft/kissfft_impl/kiss_fft.c) | 0 | ||||
| -rw-r--r-- | src/lib/fft/kissfft_impl/kiss_fft.h (renamed from src/fft/kissfft_impl/kiss_fft.h) | 0 | ||||
| -rw-r--r-- | src/lib/mdct/mdct.h | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 382e59d..ad8c73d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,8 +61,8 @@ include_directories( "lib/liboma/include" ) -set(SOURCE_FFT_LIB fft/kissfft_impl/kiss_fft.c) -set_source_files_properties(fft/kissfft_impl/kiss_fft.c PROPERTIES COMPILE_FLAGS -Dkiss_fft_scalar=double) +set(SOURCE_FFT_LIB lib/fft/kissfft_impl/kiss_fft.c) +set_source_files_properties(lib/fft/kissfft_impl/kiss_fft.c PROPERTIES COMPILE_FLAGS -Dkiss_fft_scalar=double) set(SOURCE_OMA_LIB lib/liboma/src/liboma.c) set(SOURCE_BITSTREAM_LIB lib/bitstream/bitstream.cpp) set(SOURCE_ATRACDENC_IMPL diff --git a/src/fft/kissfft_impl/_kiss_fft_guts.h b/src/lib/fft/kissfft_impl/_kiss_fft_guts.h index ba66144..ba66144 100644 --- a/src/fft/kissfft_impl/_kiss_fft_guts.h +++ b/src/lib/fft/kissfft_impl/_kiss_fft_guts.h diff --git a/src/fft/kissfft_impl/kiss_fft.c b/src/lib/fft/kissfft_impl/kiss_fft.c index 465d6c9..465d6c9 100644 --- a/src/fft/kissfft_impl/kiss_fft.c +++ b/src/lib/fft/kissfft_impl/kiss_fft.c diff --git a/src/fft/kissfft_impl/kiss_fft.h b/src/lib/fft/kissfft_impl/kiss_fft.h index 7786eb6..7786eb6 100644 --- a/src/fft/kissfft_impl/kiss_fft.h +++ b/src/lib/fft/kissfft_impl/kiss_fft.h diff --git a/src/lib/mdct/mdct.h b/src/lib/mdct/mdct.h index 59b9af7..988d1e9 100644 --- a/src/lib/mdct/mdct.h +++ b/src/lib/mdct/mdct.h @@ -19,7 +19,7 @@ #pragma once #include "config.h" -#include "fft/kissfft_impl/kiss_fft.h" +#include <lib/fft/kissfft_impl/kiss_fft.h> #include <vector> #include <type_traits> |