diff options
| author | Nils Wallménius <nils@rockbox.org> | 2011-08-18 16:33:41 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2011-08-18 16:33:41 +0000 |
| commit | b086458e4e1908878161ab5b84f287d5d726497b (patch) | |
| tree | e4ff33e7ef1f6c5cd1b956ec69881c554f74307f /apps/codecs/libffmpegFLAC/libffmpegFLAC.make | |
| parent | 46d7fb9b4a59dcebf9b68c38bc77b2c0f0761d33 (diff) | |
| download | rockbox-b086458e4e1908878161ab5b84f287d5d726497b.tar.gz rockbox-b086458e4e1908878161ab5b84f287d5d726497b.zip | |
FS#12231
Centralize the selection of codec compilation flags to codec.make
to avoid having to duplicate the per cpu selection logic and the
build rule in the individual codec lib make files and make tweaking
easier.
The two special cases, libmad and libspeex were left alone.
I plan to introduce a var for arm generation so that appropriate flags
can be selected per generation as benchmarking results have shown that
different arm arches might have different optimal flags.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30330 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libffmpegFLAC/libffmpegFLAC.make')
| -rw-r--r-- | apps/codecs/libffmpegFLAC/libffmpegFLAC.make | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make index 912538530a..734f3d2d8e 100644 --- a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make +++ b/apps/codecs/libffmpegFLAC/libffmpegFLAC.make | |||
| @@ -13,14 +13,6 @@ FFMPEGFLACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libffmpegFLAC/SOURCES) | |||
| 13 | FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC)) | 13 | FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC)) |
| 14 | OTHER_SRC += $(FFMPEGFLACLIB_SRC) | 14 | OTHER_SRC += $(FFMPEGFLACLIB_SRC) |
| 15 | 15 | ||
| 16 | # libffmpegFLAC is faster on ARM-targets with -O2 than -O1 | ||
| 17 | FFMPEGFLACFLAGS = -I$(APPSDIR)/codecs/libffmpegFLAC $(filter-out -O%,$(CODECFLAGS)) | ||
| 18 | FFMPEGFLACFLAGS += -O2 | ||
| 19 | |||
| 20 | $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ) | 16 | $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ) |
| 21 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
| 22 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
| 23 | |||
| 24 | $(CODECDIR)/libffmpegFLAC/%.o: $(ROOTDIR)/apps/codecs/libffmpegFLAC/%.c | ||
| 25 | $(SILENT)mkdir -p $(dir $@) | ||
| 26 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(FFMPEGFLACFLAGS) -c $< -o $@ | ||