分割 pilk module

foyoux · May 18, 2022 · dd27784 · dd27784
1 parent cb9367b
commit dd27784
Show file tree

Hide file tree

Showing 8 changed files with 670 additions and 634 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ link_directories(${PYTHON_HOME}/libs)
 include_directories(src/interface)
 include_directories(src/SKP_SILK_SRC)
 
-add_library(pilk SHARED src/pilkmodule.c)
+add_library(pilk SHARED src/pilkmodule.c src/silk/pilk_encode.c src/silk/pilk_decode.c)
 
 add_subdirectory(src/SKP_SILK_SRC)
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include src/interface/*.h
-include src/SKP_SILK_SRC/*.h
+include src/SKP_SILK_SRC/*.h
+include src/silk/*.h
diff --git a/setup.py b/setup.py
@@ -3,15 +3,15 @@
 from setuptools import setup, Extension
 
 SKP_SILK_SRC = 'src/SKP_SILK_SRC/'
-sources = glob(SKP_SILK_SRC + '*.c')
+sources = glob(SKP_SILK_SRC + '*.c') + glob('src/silk/*.c')
 # noinspection SpellCheckingInspection
 sources.append('src/pilkmodule.c')
 
 # noinspection SpellCheckingInspection
 pilkmodule = Extension(
     name='pilk._pilk',
     sources=sources,
-    include_dirs=[SKP_SILK_SRC, 'src/interface']
+    include_dirs=[SKP_SILK_SRC, 'src/interface', 'src/silk']
 )
 
 with open('README.md', encoding='utf8') as f:
@@ -20,7 +20,7 @@
 # noinspection SpellCheckingInspection
 setup(
     name='pilk',
-    version='0.1.0',
+    version='0.2.0',
     description='python silk voice library',
     long_description=long_description,
     long_description_content_type='text/markdown',