diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-09-03 18:27:14 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-09-03 18:27:14 +0000 |
commit | 41a0bfc5ede0de1196d3adb552b5ef659daebd4c (patch) | |
tree | d56bd4ed99f3d8e2e7d422261023e5da406002e5 | |
parent | 573f2206c1934e925b35565f472613d4917552d3 (diff) | |
download | rockbox-41a0bfc5ede0de1196d3adb552b5ef659daebd4c.tar.gz rockbox-41a0bfc5ede0de1196d3adb552b5ef659daebd4c.zip |
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
-rw-r--r-- | apps/plugins/doom/doom.make | 2 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.make | 6 |
2 files changed, 7 insertions, 1 deletions
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)) | |||
18 | # add source files to OTHER_SRC to get automatic dependencies | 18 | # add source files to OTHER_SRC to get automatic dependencies |
19 | OTHER_SRC += $(DOOM_SRC) | 19 | OTHER_SRC += $(DOOM_SRC) |
20 | 20 | ||
21 | DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing | 21 | DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing -fgnu89-inline |
22 | 22 | ||
23 | ifndef APP_TYPE | 23 | ifndef APP_TYPE |
24 | ifeq ($(TARGET), IRIVER_H100) | 24 | 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)) | |||
18 | # add source files to OTHER_SRC to get automatic dependencies | 18 | # add source files to OTHER_SRC to get automatic dependencies |
19 | OTHER_SRC += $(MPEG_SRC) | 19 | OTHER_SRC += $(MPEG_SRC) |
20 | 20 | ||
21 | MPEGCFLAGS = $(PLUGINFLAGS) -fgnu89-inline | ||
22 | |||
21 | $(MPEGBUILDDIR)/mpegplayer.rock: $(MPEG_OBJ) $(CODECDIR)/libmad-mpeg.a | 23 | $(MPEGBUILDDIR)/mpegplayer.rock: $(MPEG_OBJ) $(CODECDIR)/libmad-mpeg.a |
24 | |||
25 | $(MPEGBUILDDIR)/%.o: $(MPEGSRCDIR)/%.c $(MPEGSRCDIR)/mpegplayer.make | ||
26 | $(SILENT)mkdir -p $(dir $@) | ||
27 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(MPEGCFLAGS) -c $< -o $@ | ||