ref: b2c00d2751f32aa9869250b65f6a7e4aa40a0116
parent: 06d57b2165a3de0b8d1dd537382a80114b89081b
author: Jean-Marc Valin <[email protected]>
date: Tue Aug 2 04:13:42 EDT 2011
Makefile fixes silk_sources.mk no longer needs to be patched (s/if/ifdef/) for the draft Makefile to work.
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,12 @@
include silk_sources.mk
include opus_sources.mk
+if FIXED_POINT
+SILK_SOURCES += $(SILK_SOURCES_FIXED)
+else
+SILK_SOURCES += $(SILK_SOURCES_FLOAT)
+endif
+
include celt_headers.txt
include silk_headers.txt
include opus_headers.txt
--- a/Makefile.draft
+++ b/Makefile.draft
@@ -23,6 +23,12 @@
include celt_sources.mk
include opus_sources.mk
+ifdef FIXED_POINT
+SILK_SOURCES += $(SILK_SOURCES_FIXED)
+else
+SILK_SOURCES += $(SILK_SOURCES_FLOAT)
+endif
+
EXESUFFIX =
LIBPREFIX = lib
LIBSUFFIX = .a
--- a/doc/build_draft.sh
+++ b/doc/build_draft.sh
@@ -28,8 +28,7 @@
cp -a "${toplevel}"/Makefile.draft "${destdir}"/Makefile cp -a "${toplevel}"/opus_sources.mk "${destdir}"/ cp -a "${toplevel}"/celt_sources.mk "${destdir}"/-cat "${toplevel}"/silk_sources.mk | sed 's/^if /ifdef /' \- > "${destdir}"/silk_sources.mk+cp -a "${toplevel}"/silk_sources.mk "${destdir}"/ cp -a "${toplevel}"/README.draft "${destdir}"/README cp -a "${toplevel}"/COPYING "${destdir}"/COPYING--- a/silk_sources.mk
+++ b/silk_sources.mk
@@ -94,8 +94,7 @@
silk/silk_stereo_quant_pred.c
-if FIXED_POINT
-SILK_SOURCES += \
+SILK_SOURCES_FIXED = \
silk/fixed/silk_LTP_analysis_filter_FIX.c \
silk/fixed/silk_LTP_scale_ctrl_FIX.c \
silk/fixed/silk_corrMatrix_FIX.c \
@@ -112,8 +111,8 @@
silk/fixed/silk_residual_energy_FIX.c \
silk/fixed/silk_solve_LS_FIX.c \
silk/fixed/silk_warped_autocorrelation_FIX.c
-else
-SILK_SOURCES += \
+
+SILK_SOURCES_FLOAT = \
silk/float/silk_apply_sine_window_FLP.c \
silk/float/silk_corrMatrix_FLP.c \
silk/float/silk_encode_frame_FLP.c \
@@ -145,4 +144,3 @@
silk/float/silk_scale_vector_FLP.c \
silk/float/silk_schur_FLP.c \
silk/float/silk_sort_FLP.c
-endif