build fixes
authorJean-Marc Valin <jean-marc.valin@octasic.com>
Mon, 2 May 2011 15:12:44 +0000 (11:12 -0400)
committerJean-Marc Valin <jean-marc.valin@octasic.com>
Mon, 2 May 2011 15:12:44 +0000 (11:12 -0400)
Makefile.am
configure.ac
silk_sources.mk

index d3685ce..4216655 100644 (file)
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libopus.la
 
-INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk
+INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed
 
 include celt_sources.mk
 include silk_sources.mk
index a7e1154..4783fc3 100644 (file)
@@ -214,11 +214,5 @@ AC_MSG_RESULT([
 ------------------------------------------------------------------------
 ])
 
-if test "x$tools" = "x"; then 
-echo "**IMPORTANT**"
-echo "You don't seem to have the development package for libogg (libogg-devel) available. Only the library will be built (no encoder/decoder executable)"
-echo "You can download libogg from http://www.vorbis.com/download.psp"
-fi
-
 echo "Type \"make; make install\" to compile and install";
 echo "Type \"make check\" to run the test suite";
index 4c50b56..77820a6 100644 (file)
@@ -98,7 +98,7 @@ silk/SKP_Silk_stereo_encode_pred.c \
 silk/SKP_Silk_stereo_find_predictor.c
 
 
-ifdef FIXED_POINT
+if FIXED_POINT
 SILK_SOURCES += \
 silk/fixed/SKP_Silk_LTP_analysis_filter_FIX.c \
 silk/fixed/SKP_Silk_LTP_scale_ctrl_FIX.c \