[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Fri Sep 18 20:48:49 UTC 2009
The following commit has been merged in the master branch:
commit e00a083a6ed2f634ce56af8708d5eb6a732b9873
Merge: 715cf1783a1fb70462b36ef90dcf7c71028ca2b0 1c0f67d8e7c07a8cd87bcc385f727952b54f7852
Author: Martin Storsjo <martin at martin.st>
Date: Mon Jun 22 22:38:52 2009 +0300
Merge branch 'master' into new-upstream
diff --combined amrnb/Makefile
index 6a1c711,48a4ed6..c6a5fff
--- a/amrnb/Makefile
+++ b/amrnb/Makefile
@@@ -8,6 -8,7 +8,7 @@@ ifneq (, $(BUILD_AS_C)
CXX = $(CC)
CXXFLAGS += -x c -std=c99
endif
+ CXXFLAGS += -fPIC -DPIC
ifeq (, $(PREFIX))
PREFIX = /usr/local
@@@ -32,12 -33,6 +33,12 @@@ COMMON_SRC := $(shell cd $(COMMON_SRC_D
DEC_SRC := $(DEC_SRC:decoder_gsm_amr.cpp=)
DEC_SRC := $(DEC_SRC:pvgsmamrdecoder.cpp=)
ENC_SRC := $(ENC_SRC:gsmamr_encoder_wrapper.cpp=)
+ENC_SRC := $(ENC_SRC:vad2.cpp=)
+COMMON_SRC := $(COMMON_SRC:bits2prm.cpp=)
+COMMON_SRC := $(COMMON_SRC:copy.cpp=)
+COMMON_SRC := $(COMMON_SRC:div_32.cpp=)
+COMMON_SRC := $(COMMON_SRC:l_abs.cpp=)
+COMMON_SRC := $(COMMON_SRC:vad1.cpp=)
DEC_OBJS := $(DEC_SRC:.cpp=.o)
DEC_OBJS := $(patsubst %,$(DEC_SRC_DIR)/%, $(DEC_OBJS))
--
opencore-amr packaging
More information about the pkg-multimedia-commits
mailing list