diff options
| author | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2011-08-02 16:13:42 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2011-08-02 16:13:42 +0400 |
| commit | b2c00d2751f32aa9869250b65f6a7e4aa40a0116 (patch) | |
| tree | 1e152d8abd832e546af1c2285066d87555c04b74 | |
| parent | 06d57b2165a3de0b8d1dd537382a80114b89081b (diff) | |
Makefile fixes
silk_sources.mk no longer needs to be patched (s/if/ifdef/) for
the draft Makefile to work.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | Makefile.draft | 6 | ||||
| -rwxr-xr-x | doc/build_draft.sh | 3 | ||||
| -rw-r--r-- | silk_sources.mk | 8 |
4 files changed, 16 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 7df07c82..76490f7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,12 @@ include celt_sources.mk 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 diff --git a/Makefile.draft b/Makefile.draft index 85be8077..f68b048a 100644 --- a/Makefile.draft +++ b/Makefile.draft @@ -23,6 +23,12 @@ include silk_sources.mk 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 diff --git a/doc/build_draft.sh b/doc/build_draft.sh index d474819c..f5b1da10 100755 --- a/doc/build_draft.sh +++ b/doc/build_draft.sh @@ -28,8 +28,7 @@ cp -a "${toplevel}"/src/opus_custom.h "${destdir}"/src/ 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 diff --git a/silk_sources.mk b/silk_sources.mk index a263c7c5..2e3151f3 100644 --- a/silk_sources.mk +++ b/silk_sources.mk @@ -94,8 +94,7 @@ silk/silk_stereo_find_predictor.c \ 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_energy16_FIX.c \ 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_copy_vector_FLP.c \ silk/float/silk_scale_vector_FLP.c \ silk/float/silk_schur_FLP.c \ silk/float/silk_sort_FLP.c -endif |