diff options
author | Jeongmo Yang <jm80.yang@samsung.com> | 2015-08-05 16:30:55 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2015-08-05 17:27:28 +0900 |
commit | 57eb34e9d791a94afaa8307fdbd538a66e01080e (patch) | |
tree | d3532a4ee6e938e9a153e1c9e1ed1b571e7e48b2 /amrnb/Makefile.am | |
parent | 72a792824e352ad4084c3729154a444f57b7b8bb (diff) | |
download | opencore-amr-tizen_3.0.m1_mobile.tar.gz opencore-amr-tizen_3.0.m1_mobile.tar.bz2 opencore-amr-tizen_3.0.m1_mobile.zip |
Version update 1.2.0 -> 1.3.0 (fix crash on 64bit)tizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_unified/20170308.100415submit/tizen_ivi/20160217.000006submit/tizen_ivi/20160217.000000submit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_3.0_wearable/20161015.000004submit/tizen_3.0_tv/20161015.000004submit/tizen_3.0_mobile/20161015.000005submit/tizen_3.0_ivi/20161010.000005submit/tizen_3.0_common/20161104.104000submit/tizen_3.0.m2/20170104.093754submit/tizen/20150805.084143accepted/tizen/wearable/20150805.103244accepted/tizen/unified/20170309.040230accepted/tizen/tv/20150805.103220accepted/tizen/mobile/20150805.103211accepted/tizen/ivi/20160218.025231accepted/tizen/3.0/wearable/20161015.083554accepted/tizen/3.0/tv/20161016.005243accepted/tizen/3.0/mobile/20161015.033933accepted/tizen/3.0/ivi/20161011.055336accepted/tizen/3.0/common/20161114.111409accepted/tizen/3.0.m2/wearable/20170105.025349accepted/tizen/3.0.m2/tv/20170105.025253accepted/tizen/3.0.m2/mobile/20170105.025145tizen_3.0_tvtizen_3.0.m2tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_3.0_wearableaccepted/tizen_3.0_tvaccepted/tizen_3.0_mobileaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
Change-Id: Ide07602a8064b14e88d8842c777d5f68db71d644
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
Diffstat (limited to 'amrnb/Makefile.am')
-rw-r--r-- | amrnb/Makefile.am | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/amrnb/Makefile.am b/amrnb/Makefile.am index cc4cf3c..1b42bd5 100644 --- a/amrnb/Makefile.am +++ b/amrnb/Makefile.am @@ -14,21 +14,31 @@ OSCL = $(top_srcdir)/oscl AM_CFLAGS = -I$(OSCL) -I$(DEC_SRC_DIR) -I$(COMMON_DIR)/include \ -I$(DEC_DIR)/include -I$(AMR_BASE)/common/dec/include -I$(ENC_SRC_DIR) +if GCC_ARMV5 + AM_CFLAGS += -DPV_CPU_ARCH_VERSION=5 -DPV_COMPILER=1 +endif + if COMPILE_AS_C AM_CFLAGS += -x c -std=c99 + libopencore_amrnb_la_LINK = $(LINK) $(libopencore_amrnb_la_LDFLAGS) + # Mention a dummy pure C file to trigger generation of the $(LINK) variable + nodist_EXTRA_libopencore_amrnb_la_SOURCES = dummy.c +else + libopencore_amrnb_la_LINK = $(CXXLINK) $(libopencore_amrnb_la_LDFLAGS) endif AM_CXXFLAGS = $(AM_CFLAGS) amrnbincludedir = $(includedir)/opencore-amrnb -amrnbinclude_HEADERS = interf_dec.h interf_enc.h +amrnbinclude_HEADERS = pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = opencore-amrnb.pc lib_LTLIBRARIES = libopencore-amrnb.la -libopencore_amrnb_la_LDFLAGS = -version-info @OPENCORE_AMRNB_VERSION@ +libopencore_amrnb_la_LDFLAGS = -version-info @OPENCORE_AMRNB_VERSION@ -no-undefined -export-symbols $(top_srcdir)/amrnb/opencore-amrnb.sym +EXTRA_DIST = $(top_srcdir)/amrnb/opencore-amrnb.sym # Our sources to include. There are certain sources we exclude and they are # $(DEC_SRC_DIR)/decoder_gsm_amr.cpp @@ -42,7 +52,10 @@ libopencore_amrnb_la_LDFLAGS = -version-info @OPENCORE_AMRNB_VERSION@ # $(COMMON_SRC_DIR)/vad1.cpp # $(COMMON_SRC_DIR)/vad2.cpp libopencore_amrnb_la_SOURCES = \ - wrapper.cpp \ + wrapper.cpp + +if AMRNB_DECODER + libopencore_amrnb_la_SOURCES += \ $(DEC_SRC_DIR)/agc.cpp \ $(DEC_SRC_DIR)/amrdecode.cpp \ $(DEC_SRC_DIR)/a_refl.cpp \ @@ -77,7 +90,14 @@ libopencore_amrnb_la_SOURCES = \ $(DEC_SRC_DIR)/pstfilt.cpp \ $(DEC_SRC_DIR)/qgain475_tab.cpp \ $(DEC_SRC_DIR)/sp_dec.cpp \ - $(DEC_SRC_DIR)/wmf_to_ets.cpp \ + $(DEC_SRC_DIR)/wmf_to_ets.cpp + amrnbinclude_HEADERS += interf_dec.h +else + AM_CFLAGS += -DDISABLE_AMRNB_DECODER +endif + +if AMRNB_ENCODER + libopencore_amrnb_la_SOURCES += \ $(ENC_SRC_DIR)/amrencode.cpp \ $(ENC_SRC_DIR)/autocorr.cpp \ $(ENC_SRC_DIR)/c1035pf.cpp \ @@ -138,12 +158,17 @@ libopencore_amrnb_la_SOURCES = \ $(ENC_SRC_DIR)/spreproc.cpp \ $(ENC_SRC_DIR)/spstproc.cpp \ $(ENC_SRC_DIR)/ton_stab.cpp \ - $(ENC_SRC_DIR)/vad1.cpp \ + $(ENC_SRC_DIR)/vad1.cpp + amrnbinclude_HEADERS += interf_enc.h +else + AM_CFLAGS += -DDISABLE_AMRNB_ENCODER +endif + +libopencore_amrnb_la_SOURCES += \ $(COMMON_SRC_DIR)/add.cpp \ $(COMMON_SRC_DIR)/az_lsp.cpp \ $(COMMON_SRC_DIR)/bitno_tab.cpp \ $(COMMON_SRC_DIR)/bitreorder_tab.cpp \ - $(COMMON_SRC_DIR)/bytesused.cpp \ $(COMMON_SRC_DIR)/c2_9pf_tab.cpp \ $(COMMON_SRC_DIR)/div_s.cpp \ $(COMMON_SRC_DIR)/extract_h.cpp \ @@ -197,4 +222,3 @@ libopencore_amrnb_la_SOURCES = \ $(COMMON_SRC_DIR)/weight_a.cpp \ $(COMMON_SRC_DIR)/window_tab.cpp -EXTRA_DIST = Makefile.alt |