diff options
| author | Felicia Lim <flim@google.com> | 2016-07-25 20:28:37 +0200 |
|---|---|---|
| committer | Felicia Lim <flim@google.com> | 2016-08-01 11:41:57 +0200 |
| commit | d03c373974c945b4b62b59b873522387418a2a3f (patch) | |
| tree | 5e5c32e7d2a943a87532a9f426bc1cad137851cd /Makefile.am | |
| parent | da5155b2f54bc136754590d0871008d9622c8100 (diff) | |
| download | libopus-d03c373974c945b4b62b59b873522387418a2a3f.tar.gz | |
Upgrade Opus to v1.1.3
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index 4d3a8880..7a691140 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,8 +47,9 @@ if CPU_ARM CELT_SOURCES += $(CELT_SOURCES_ARM) SILK_SOURCES += $(SILK_SOURCES_ARM) -if OPUS_ARM_NEON_INTR +if HAVE_ARM_NEON_INTR CELT_SOURCES += $(CELT_SOURCES_ARM_NEON_INTR) +SILK_SOURCES += $(SILK_SOURCES_ARM_NEON_INTR) endif if HAVE_ARM_NE10 @@ -165,25 +166,25 @@ EXTRA_DIST = version.mk \ tests/run_vectors.sh \ celt/arm/arm2gnu.pl \ celt/arm/celt_pitch_xcorr_arm.s \ - win32/VS2010/silk_float.vcxproj \ - win32/VS2010/celt.vcxproj.filters \ - win32/VS2010/opus.vcxproj \ - win32/VS2010/silk_common.vcxproj.filters \ - win32/VS2010/silk_float.vcxproj.filters \ - win32/VS2010/test_opus_encode.vcxproj.filters \ - win32/VS2010/silk_common.vcxproj \ - win32/VS2010/test_opus_encode.vcxproj \ - win32/VS2010/opus_demo.vcxproj \ - win32/VS2010/test_opus_api.vcxproj.filters \ - win32/VS2010/test_opus_api.vcxproj \ - win32/VS2010/test_opus_decode.vcxproj.filters \ - win32/VS2010/silk_fixed.vcxproj.filters \ - win32/VS2010/opus_demo.vcxproj.filters \ - win32/VS2010/silk_fixed.vcxproj \ - win32/VS2010/opus.vcxproj.filters \ - win32/VS2010/test_opus_decode.vcxproj \ - win32/VS2010/celt.vcxproj \ - win32/VS2010/opus.sln \ + win32/VS2015/silk_float.vcxproj \ + win32/VS2015/celt.vcxproj.filters \ + win32/VS2015/opus.vcxproj \ + win32/VS2015/silk_common.vcxproj.filters \ + win32/VS2015/silk_float.vcxproj.filters \ + win32/VS2015/test_opus_encode.vcxproj.filters \ + win32/VS2015/silk_common.vcxproj \ + win32/VS2015/test_opus_encode.vcxproj \ + win32/VS2015/opus_demo.vcxproj \ + win32/VS2015/test_opus_api.vcxproj.filters \ + win32/VS2015/test_opus_api.vcxproj \ + win32/VS2015/test_opus_decode.vcxproj.filters \ + win32/VS2015/silk_fixed.vcxproj.filters \ + win32/VS2015/opus_demo.vcxproj.filters \ + win32/VS2015/silk_fixed.vcxproj \ + win32/VS2015/opus.vcxproj.filters \ + win32/VS2015/test_opus_decode.vcxproj \ + win32/VS2015/celt.vcxproj \ + win32/VS2015/opus.sln \ win32/genversion.bat \ win32/config.h @@ -294,8 +295,8 @@ SSE4_1_OBJ = $(CELT_SOURCES_SSE4_1:.c=.lo) \ $(SSE4_1_OBJ) $(OPT_UNIT_TEST_OBJ): CFLAGS += $(OPUS_X86_SSE4_1_CFLAGS) endif -if OPUS_ARM_NEON_INTR -CELT_ARM_NEON_INTR_OBJ = $(CELT_SOURCES_ARM_NEON_INTR:.c=.lo) -$(CELT_ARM_NEON_INTR_OBJ) $(OPT_UNIT_TEST_OBJ): CFLAGS += \ +if HAVE_ARM_NEON_INTR +ARM_NEON_INTR_OBJ = $(CELT_SOURCES_ARM_NEON_INTR:.c=.lo) $(SILK_SOURCES_ARM_NEON_INTR:.c=.lo) +$(ARM_NEON_INTR_OBJ) $(OPT_UNIT_TEST_OBJ): CFLAGS += \ $(OPUS_ARM_NEON_INTR_CFLAGS) $(NE10_CFLAGS) endif |