diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2006-02-24 13:48:52 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2006-02-24 13:48:52 +0000 |
commit | f16c1f341a479a61e2cdf1f54de7106ac8d5fc36 (patch) | |
tree | e46bc273a0395fc501f0c4cce45b044ea58618af /apps | |
parent | 1272c8a696c4b942b982a1841585b31bbcf2e9ab (diff) | |
download | rockbox-f16c1f341a479a61e2cdf1f54de7106ac8d5fc36.tar.gz rockbox-f16c1f341a479a61e2cdf1f54de7106ac8d5fc36.zip |
prevent rockbox from using the wrong includes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8827 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/Tremor/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/lib/Makefile | 4 | ||||
-rw-r--r-- | apps/codecs/libfaad/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libm4a/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libmad/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libmusepack/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libwavpack/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/databox/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/lib/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/searchengine/Makefile | 2 |
15 files changed, 16 insertions, 16 deletions
diff --git a/apps/Makefile b/apps/Makefile index 55386c9e43..64bca835fc 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -54,7 +54,7 @@ ifdef APPEXTRA | |||
54 | INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA))) | 54 | INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA))) |
55 | endif | 55 | endif |
56 | 56 | ||
57 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) -DTARGET_ID=$(TARGET_ID) \ | 57 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(DEFINES) -DTARGET_ID=$(TARGET_ID) \ |
58 | -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 58 | -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} |
59 | 59 | ||
60 | OBJS2 := $(OBJDIR)/lang.o $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) | 60 | OBJS2 := $(OBJDIR)/lang.o $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) |
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index e0d4e47f54..f39eb55524 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ | 10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ |
11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) |
12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 12 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DCODEC | 13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DCODEC |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile index cec9797f63..ecd4ac9478 100644 --- a/apps/codecs/Tremor/Makefile +++ b/apps/codecs/Tremor/Makefile | |||
@@ -15,7 +15,7 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | TREMOROPTS = -O2 | 17 | TREMOROPTS = -O2 |
18 | CFLAGS = $(GCCOPTS) $(TREMOROPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TREMOROPTS) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} ${PROFILE_OPTS} | 19 | -DMEM=${MEMORYSIZE} ${PROFILE_OPTS} |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
diff --git a/apps/codecs/lib/Makefile b/apps/codecs/lib/Makefile index 49be70a62d..18f478c474 100644 --- a/apps/codecs/lib/Makefile +++ b/apps/codecs/lib/Makefile | |||
@@ -17,8 +17,8 @@ ifdef APPEXTRA | |||
17 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | 17 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
18 | endif | 18 | endif |
19 | 19 | ||
20 | CFLAGS = $(GCCOPTS) \ | 20 | CFLAGS = $(INCLUDES) $(GCCOPTS) \ |
21 | $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -DCODEC | 21 | $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} -DCODEC |
22 | 22 | ||
23 | # This sets up 'SRC' based on the files mentioned in SOURCES | 23 | # This sets up 'SRC' based on the files mentioned in SOURCES |
24 | include $(TOOLSDIR)/makesrc.inc | 24 | include $(TOOLSDIR)/makesrc.inc |
diff --git a/apps/codecs/libfaad/Makefile b/apps/codecs/libfaad/Makefile index 548ae5c602..bf30817aa2 100644 --- a/apps/codecs/libfaad/Makefile +++ b/apps/codecs/libfaad/Makefile | |||
@@ -15,7 +15,7 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | FAADOPTS = -O2 -Wno-char-subscripts | 17 | FAADOPTS = -O2 -Wno-char-subscripts |
18 | CFLAGS = $(GCCOPTS) $(FAADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(FAADOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} | 19 | -DMEM=${MEMORYSIZE} |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
diff --git a/apps/codecs/libffmpegFLAC/Makefile b/apps/codecs/libffmpegFLAC/Makefile index 7d9030e648..ee3f39261d 100644 --- a/apps/codecs/libffmpegFLAC/Makefile +++ b/apps/codecs/libffmpegFLAC/Makefile | |||
@@ -15,7 +15,7 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | FLACOPTS = -O2 | 17 | FLACOPTS = -O2 |
18 | CFLAGS = $(GCCOPTS) $(FLACOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(FLACOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) | 19 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
diff --git a/apps/codecs/libm4a/Makefile b/apps/codecs/libm4a/Makefile index fcbc10045e..04e5fdf4c3 100644 --- a/apps/codecs/libm4a/Makefile +++ b/apps/codecs/libm4a/Makefile | |||
@@ -15,7 +15,7 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | M4AOPTS = -O3 | 17 | M4AOPTS = -O3 |
18 | CFLAGS = $(GCCOPTS) $(M4AOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(M4AOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) | 19 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile index 3747197f13..ee5c0caca6 100644 --- a/apps/codecs/libmad/Makefile +++ b/apps/codecs/libmad/Makefile | |||
@@ -16,7 +16,7 @@ endif | |||
16 | 16 | ||
17 | # NOTE: FPM_ define has been moved to global.h | 17 | # NOTE: FPM_ define has been moved to global.h |
18 | MADOPTS = -UDEBUG -DNDEBUG -O2 | 18 | MADOPTS = -UDEBUG -DNDEBUG -O2 |
19 | CFLAGS = $(GCCOPTS) $(MADOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 19 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(MADOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
20 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) | 20 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) |
21 | 21 | ||
22 | # This sets up 'SRC' based on the files mentioned in SOURCES | 22 | # This sets up 'SRC' based on the files mentioned in SOURCES |
diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile index 6bfa2f9462..f5c59cce4a 100644 --- a/apps/codecs/libmusepack/Makefile +++ b/apps/codecs/libmusepack/Makefile | |||
@@ -15,7 +15,7 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | MUSEPACKOPTS = -O2 | 17 | MUSEPACKOPTS = -O2 |
18 | CFLAGS = $(GCCOPTS) $(MUSEPACKOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(MUSEPACKOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) | 19 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile index eba67fa7fc..60911a052f 100644 --- a/apps/codecs/libwavpack/Makefile +++ b/apps/codecs/libwavpack/Makefile | |||
@@ -15,7 +15,7 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | WAVPACKOPTS = -O2 | 17 | WAVPACKOPTS = -O2 |
18 | CFLAGS = $(GCCOPTS) $(WAVPACKOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(WAVPACKOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
19 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) | 19 | -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 6f57636c69..32286a25df 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -10,7 +10,7 @@ | |||
10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ | 10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ |
11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) \ | 11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) \ |
12 | -I$(BUILDDIR)/pluginbitmaps | 12 | -I$(BUILDDIR)/pluginbitmaps |
13 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 13 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
14 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN | 14 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN |
15 | 15 | ||
16 | ifdef APPEXTRA | 16 | ifdef APPEXTRA |
diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile index 6a44333b3f..1205234d38 100644 --- a/apps/plugins/databox/Makefile +++ b/apps/plugins/databox/Makefile | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ |
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) |
12 | CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 12 | CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \ |
13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN | 13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile index ca9c3f3576..916c63203d 100644 --- a/apps/plugins/lib/Makefile +++ b/apps/plugins/lib/Makefile | |||
@@ -17,7 +17,7 @@ ifdef APPEXTRA | |||
17 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | 17 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
18 | endif | 18 | endif |
19 | 19 | ||
20 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 20 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
21 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN | 21 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN |
22 | 22 | ||
23 | # Sectioned compilation for target | 23 | # Sectioned compilation for target |
diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile index d9d310702f..694dcde251 100644 --- a/apps/plugins/rockboy/Makefile +++ b/apps/plugins/rockboy/Makefile | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ |
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) |
12 | CFLAGS = $(GCCOPTS) -O2 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 12 | CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ |
13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -finline-functions | 13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -finline-functions |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index baa0020cc2..21b53cbefe 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ |
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) |
12 | CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 12 | CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \ |
13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN | 13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |