From 41a0bfc5ede0de1196d3adb552b5ef659daebd4c Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Sat, 3 Sep 2011 18:27:14 +0000 Subject: [PATCH] FS#12256: Use '-fgnu89-inline' for mpegplayer and doom. Resolves compiler warnings when using mingw32. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30420 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/doom/doom.make | 2 +- apps/plugins/mpegplayer/mpegplayer.make | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index 07b553c454..a405a5ff3f 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make @@ -18,7 +18,7 @@ DOOM_OBJ := $(call c2obj, $(DOOM_SRC)) # add source files to OTHER_SRC to get automatic dependencies OTHER_SRC += $(DOOM_SRC) -DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing +DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing -fgnu89-inline ifndef APP_TYPE ifeq ($(TARGET), IRIVER_H100) diff --git a/apps/plugins/mpegplayer/mpegplayer.make b/apps/plugins/mpegplayer/mpegplayer.make index cd7e006031..2a39e7ddce 100644 --- a/apps/plugins/mpegplayer/mpegplayer.make +++ b/apps/plugins/mpegplayer/mpegplayer.make @@ -18,4 +18,10 @@ MPEG_OBJ := $(call c2obj, $(MPEG_SRC)) # add source files to OTHER_SRC to get automatic dependencies OTHER_SRC += $(MPEG_SRC) +MPEGCFLAGS = $(PLUGINFLAGS) -fgnu89-inline + $(MPEGBUILDDIR)/mpegplayer.rock: $(MPEG_OBJ) $(CODECDIR)/libmad-mpeg.a + +$(MPEGBUILDDIR)/%.o: $(MPEGSRCDIR)/%.c $(MPEGSRCDIR)/mpegplayer.make + $(SILENT)mkdir -p $(dir $@) + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(MPEGCFLAGS) -c $< -o $@