diff options
| author | Jean-Marc Valin <jmvalin@amazon.com> | 2023-06-22 10:38:24 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-06-22 10:38:24 +0300 |
| commit | 3c9ada30efb1748f2608fd6838cac25d2a5a1472 (patch) | |
| tree | 82292b3cff7cd5bfaef8dd0cd6b92fb5799233fe | |
| parent | 42a0972a111a4d93d5a8ef2dbb8fb2aa97be9986 (diff) | |
Move LPCNet headers
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | dnn/dred_rdovae.h (renamed from dnn/include/dred_rdovae.h) | 0 | ||||
| -rw-r--r-- | dnn/lpcnet.h (renamed from dnn/include/lpcnet.h) | 0 | ||||
| -rw-r--r-- | lpcnet_headers.mk | 4 | ||||
| -rw-r--r-- | meson.build | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a67c0991..a618e762 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,7 +278,7 @@ target_include_directories( $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/opus> PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/dnn/include + ${CMAKE_CURRENT_SOURCE_DIR}/dnn celt silk) @@ -601,7 +601,7 @@ if(OPUS_BUILD_PROGRAMS) target_include_directories(opus_demo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(opus_demo PRIVATE silk) # debug.h target_include_directories(opus_demo PRIVATE celt) # arch.h - target_include_directories(opus_demo PRIVATE dnn/include) + target_include_directories(opus_demo PRIVATE dnn) target_link_libraries(opus_demo PRIVATE opus ${OPUS_REQUIRED_LIBRARIES}) target_compile_definitions(opus_demo PRIVATE OPUS_BUILD) @@ -652,7 +652,7 @@ if(BUILD_TESTING AND NOT BUILD_SHARED_LIBS) add_executable(test_opus_encode ${test_opus_encode_sources}) target_include_directories(test_opus_encode - PRIVATE ${CMAKE_CURRENT_BINARY_DIR} celt dnn/include) + PRIVATE ${CMAKE_CURRENT_BINARY_DIR} celt dnn) target_link_libraries(test_opus_encode PRIVATE opus) target_compile_definitions(test_opus_encode PRIVATE OPUS_BUILD) add_test(NAME test_opus_encode COMMAND ${CMAKE_COMMAND} @@ -662,7 +662,7 @@ if(BUILD_TESTING AND NOT BUILD_SHARED_LIBS) add_executable(test_opus_extensions ${test_opus_extensions_sources}) target_include_directories(test_opus_extensions - PRIVATE ${CMAKE_CURRENT_BINARY_DIR} celt dnn/include) + PRIVATE ${CMAKE_CURRENT_BINARY_DIR} celt dnn) target_link_libraries(test_opus_extensions PRIVATE opus) target_compile_definitions(test_opus_extensions PRIVATE OPUS_BUILD) add_test(NAME test_opus_extensions COMMAND ${CMAKE_COMMAND} diff --git a/Makefile.am b/Makefile.am index 8c3d4b05..4a1a1ba1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ DIST_SUBDIRS = doc AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/celt -I$(top_srcdir)/silk \ -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed $(NE10_CFLAGS) \ - -I$(top_srcdir)/dnn/include + -I$(top_srcdir)/dnn include celt_sources.mk include lpcnet_sources.mk diff --git a/dnn/include/dred_rdovae.h b/dnn/dred_rdovae.h index f2c3235e..f2c3235e 100644 --- a/dnn/include/dred_rdovae.h +++ b/dnn/dred_rdovae.h diff --git a/dnn/include/lpcnet.h b/dnn/lpcnet.h index fc9978f5..fc9978f5 100644 --- a/dnn/include/lpcnet.h +++ b/dnn/lpcnet.h diff --git a/lpcnet_headers.mk b/lpcnet_headers.mk index 90a827c6..4b0cb4cf 100644 --- a/lpcnet_headers.mk +++ b/lpcnet_headers.mk @@ -3,8 +3,8 @@ silk/dred_coding.h \ silk/dred_config.h \ silk/dred_decoder.h \ silk/dred_encoder.h \ -dnn/include/dred_rdovae.h \ -dnn/include/lpcnet.h \ +dnn/dred_rdovae.h \ +dnn/lpcnet.h \ dnn/burg.h \ dnn/common.h \ dnn/freq.h \ diff --git a/meson.build b/meson.build index d8b59b64..eb604e26 100644 --- a/meson.build +++ b/meson.build @@ -14,7 +14,7 @@ host_cpu_family = host_machine.cpu_family() top_srcdir = meson.current_source_dir() top_builddir = meson.current_build_dir() -opus_includes = include_directories('.', 'include', 'celt', 'silk', 'dnn/include') +opus_includes = include_directories('.', 'include', 'celt', 'silk', 'dnn') opus_public_includes = include_directories('include') add_project_arguments('-DOPUS_BUILD', language: 'c') |