diff options
Diffstat (limited to 'amrwb')
-rw-r--r-- | amrwb/Makefile.alt | 98 | ||||
-rw-r--r-- | amrwb/Makefile.am | 13 | ||||
-rw-r--r-- | amrwb/opencore-amrwb.sym | 3 |
3 files changed, 14 insertions, 100 deletions
diff --git a/amrwb/Makefile.alt b/amrwb/Makefile.alt deleted file mode 100644 index a59cea9..0000000 --- a/amrwb/Makefile.alt +++ /dev/null @@ -1,98 +0,0 @@ -# Just set OC_BASE to the opencore root, or set AMR_BASE directly to -# a detached gsm_amr directory -OC_BASE = ../opencore -AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr -LIBDIR=lib -BINDIR=bin - -# To compile as C instead of C++, define BUILD_AS_C -ifneq (, $(BUILD_AS_C)) - CXX = $(CC) - CXXFLAGS += -x c -std=c99 -endif - -ifeq (, $(PREFIX)) - PREFIX = /usr/local -endif - -DEC_DIR = $(AMR_BASE)/amr_wb/dec -DEC_SRC_DIR = $(DEC_DIR)/src -OSCL = ../oscl - -CPPFLAGS = -I$(OSCL) -I$(DEC_SRC_DIR) -I$(DEC_DIR)/include -I$(AMR_BASE)/common/dec/include - -# Find all the source files -# Exclude only decoder_amr_wb.cpp, not dtx_decoder_amr_wb.cpp -DEC_SRC := $(shell cd $(DEC_SRC_DIR) && echo *.cpp | sed 's/ decoder_amr_wb.cpp//') - -DEC_OBJS := $(DEC_SRC:.cpp=.o) -DEC_OBJS := $(patsubst %,$(DEC_SRC_DIR)/%, $(DEC_OBJS)) - -OBJS = wrapper.o $(DEC_OBJS) -SOBJS = $(OBJS:%.o=%.lo) - -#Versioning -MAJOR = 0 -MINOR = 1 -REVISION = 1 -VERSION = $(MAJOR).$(MINOR).$(REVISION) - -ifeq ($(shell uname), Darwin) - SHLIB_EXT = dylib - SHLIB_FLAGS = -dynamiclib -else - ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT) - SHLIB_EXT = $(MAJOR).$(MINOR).$(REVISION).dll - SHLIB_FLAGS = -shared - SONAME = libopencore-amrwb-$(MAJOR).dll - else - SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION) - SHLIB_FLAGS = -shared - SONAME = libopencore-amrwb.so.$(MAJOR) - endif -endif -SHLIB = libopencore-amrwb.$(SHLIB_EXT) - -all: libopencore-amrwb.a $(SHLIB) - -$(SHLIB): $(SOBJS) -ifeq ($(shell uname), Darwin) - $(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS) -else - $(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS) -endif - -%.lo: %.c - $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@ - -%.lo: %.cpp - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@ - -libopencore-amrwb.a: $(OBJS) - ar rcs $@ $+ - -install: libopencore-amrwb.a $(SHLIB) - install -d $(DESTDIR)$(PREFIX)/$(LIBDIR) - install -m 644 libopencore-amrwb.a $(DESTDIR)$(PREFIX)/$(LIBDIR) -ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT) - install -d $(DESTDIR)$(PREFIX)/$(BINDIR) - install $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR) -else - install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR) -endif -ifneq ($(shell uname), Darwin) -ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT) - ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME) - ln -sf $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/libopencore-amrwb.dll -else - ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME) - ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrwb.so -endif -endif - install -d $(DESTDIR)$(PREFIX)/include/opencore-amrwb - install -m 644 dec_if.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb - install -m 644 if_rom.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb - -clean: - rm -f $(SHLIB) libopencore-amrwb.a *.o *.lo $(OBJS) $(SOBJS) - diff --git a/amrwb/Makefile.am b/amrwb/Makefile.am index 37a917f..a6cc33c 100644 --- a/amrwb/Makefile.am +++ b/amrwb/Makefile.am @@ -10,8 +10,17 @@ OSCL = $(top_srcdir)/oscl AM_CFLAGS = -I$(OSCL) -I$(DEC_SRC_DIR) -I$(DEC_DIR)/include \ -I$(AMR_BASE)/common/dec/include +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_amrwb_la_LINK = $(LINK) $(libopencore_amrwb_la_LDFLAGS) + # Mention a dummy pure C file to trigger generation of the $(LINK) variable + nodist_EXTRA_libopencore_amrwb_la_SOURCES = dummy.c +else + libopencore_amrwb_la_LINK = $(CXXLINK) $(libopencore_amrwb_la_LDFLAGS) endif AM_CXXFLAGS = $(AM_CFLAGS) @@ -24,7 +33,8 @@ pkgconfig_DATA = opencore-amrwb.pc lib_LTLIBRARIES = libopencore-amrwb.la -libopencore_amrwb_la_LDFLAGS = -version-info @OPENCORE_AMRWB_VERSION@ +libopencore_amrwb_la_LDFLAGS = -version-info @OPENCORE_AMRWB_VERSION@ -no-undefined -export-symbols $(top_srcdir)/amrwb/opencore-amrwb.sym +EXTRA_DIST = $(top_srcdir)/amrwb/opencore-amrwb.sym # Our sources to include. There are certain sources we exclude and they are # $(DEC_SRC_DIR)/decoder_amr_wb.cpp @@ -70,4 +80,3 @@ libopencore_amrwb_la_SOURCES = \ $(DEC_SRC_DIR)/wb_syn_filt.cpp \ $(DEC_SRC_DIR)/weight_amrwb_lpc.cpp -EXTRA_DIST = Makefile.alt diff --git a/amrwb/opencore-amrwb.sym b/amrwb/opencore-amrwb.sym new file mode 100644 index 0000000..9a1cfcb --- /dev/null +++ b/amrwb/opencore-amrwb.sym @@ -0,0 +1,3 @@ +D_IF_init +D_IF_decode +D_IF_exit |