eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-03 17:17:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move LPCNet headers

Browse source
This commit is contained in:
Jean-Marc Valin 2023-06-22 03:38:24 -04:00
parent 42a0972a11
commit 3c9ada30ef
No known key found for this signature in database
GPG key ID: 531A52533318F00A
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -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}

2
Makefile.am
View file

@ -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

0
dnn/include/dred_rdovae.h → dnn/dred_rdovae.h
View file

0
dnn/include/lpcnet.h → dnn/lpcnet.h
View file

4
lpcnet_headers.mk
View file

@ -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 \

2
meson.build
View file

@ -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')