ref: 4c928d1617047a58cd15b7c5c4402084575d3ae6
parent: 67224e3c720904c17050c366d4f746ceeffb9049
author: Jean-Marc Valin <[email protected]>
date: Thu Jul 8 07:38:44 EDT 2010
Some build fixes
--- /dev/null
+++ b/COPYING
@@ -1,0 +1,35 @@
+Copyright (c) 2006-2010, Skype Limited. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, (subject to the limitations in the disclaimer below)
+are permitted provided that the following conditions are met:
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+- Neither the name of Skype Limited, nor the names of specific
+contributors, may be used to endorse or promote products derived from
+this software without specific prior written permission.
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED
+BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Skype Limited hereby separately grants to the contributors a license
+under its patents to the software contributed by Skype for internal
+evaluation and testing purposes only. This license expressly excludes
+use of the software for distribution or use in any commercial product or
+any commercial or production use whatsoever.
+
+See the IPR statement made to the IETF for details:
+http://datatracker.ietf.org/ipr/1297/
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
NAME = libSKP_SILK_SDK
AM_CPPFLAGS = $(AM_CFLAGS)
-INCLUDES = -Isrc -Iinterface -I../celt/libcelt
+INCLUDES = -Isrc_FLP -Isrc_SigProc_FIX -Isrc_SigProc_FLP -Isrc_common -Iinterface -I../celt/libcelt
EXTRA_DIST = Silk_FLP.sln \
Silk_FLP.sln \
src_FIX/Silk_FIX.vcproj \
@@ -200,43 +200,7 @@
src_SigProc_FIX/SKP_Silk_resampler_structs.h \
src_SigProc_FIX/SKP_Silk_SigProc_FIX.h \
src_SigProc_FLP/SKP_Silk_pitch_est_defines_FLP.h \
-src_SigProc_FLP/SKP_Silk_SigProc_FLP.h \
-src/SKP_debug.h \
-src/SKP_Silk_assembler_FLP.h \
-src/SKP_Silk_common_pitch_est_defines.h \
-src/SKP_Silk_control.h \
-src/SKP_Silk_define_FIX.h \
-src/SKP_Silk_define_FLP.h \
-src/SKP_Silk_define.h \
-src/SKP_Silk_errors.h \
-src/SKP_Silk_Inlines.h \
-src/SKP_Silk_MacroCount.h \
-src/SKP_Silk_MacroDebug.h \
-src/SKP_Silk_macros.h \
-src/SKP_Silk_main_FIX.h \
-src/SKP_Silk_main_FLP.h \
-src/SKP_Silk_main.h \
-src/SKP_Silk_perceptual_parameters_FIX.h \
-src/SKP_Silk_perceptual_parameters.h \
-src/SKP_Silk_pitch_est_defines_FLP.h \
-src/SKP_Silk_pitch_est_defines.h \
-src/SKP_Silk_PLC.h \
-src/SKP_Silk_resampler_private.h \
-src/SKP_Silk_resampler_rom.h \
-src/SKP_Silk_resampler_structs.h \
-src/SKP_Silk_SDK_API.h \
-src/SKP_Silk_SigProc_FIX.h \
-src/SKP_Silk_SigProc_FLP.h \
-src/SKP_Silk_structs_FIX.h \
-src/SKP_Silk_structs_FLP.h \
-src/SKP_Silk_structs.h \
-src/SKP_Silk_tables_FLP.h \
-src/SKP_Silk_tables.h \
-src/SKP_Silk_tables_NLSF_CB0_10.h \
-src/SKP_Silk_tables_NLSF_CB0_16.h \
-src/SKP_Silk_tables_NLSF_CB1_10.h \
-src/SKP_Silk_tables_NLSF_CB1_16.h \
-src/SKP_Silk_typedef.h
+src_SigProc_FLP/SKP_Silk_SigProc_FLP.h
bin_PROGRAMS = Encoder Decoder signalCompare
Encoder_SOURCES = test/Encoder.c test/SKP_debug.c $(top_builddir)/interface/SKP_Silk_SDK_API.h