diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2006-10-23 14:09:28 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2006-10-23 14:09:28 +0000 |
commit | 5825b2c84f3b8a0fa9bd243ca5a0dec8141bc573 (patch) | |
tree | 2cb58d74d9800715a996fcc8f2c3d44372bd7002 /apps | |
parent | 37f7f0b23bc360f8ad8ad30b19055470545f5a83 (diff) | |
download | rockbox-5825b2c84f3b8a0fa9bd243ca5a0dec8141bc573.tar.gz rockbox-5825b2c84f3b8a0fa9bd243ca5a0dec8141bc573.zip |
rearrange compiler options to avoid conflicts with header files on FreeBSD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11317 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/chessbox/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/doom/Makefile | 7 | ||||
-rw-r--r-- | apps/plugins/sudoku/Makefile | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/apps/plugins/chessbox/Makefile b/apps/plugins/chessbox/Makefile index 0389493a96..c86d8056ad 100644 --- a/apps/plugins/chessbox/Makefile +++ b/apps/plugins/chessbox/Makefile | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -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 | 13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 14 | ||
15 | ifdef APPEXTRA | 15 | ifdef APPEXTRA |
diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index 90289099df..20b6aea7a3 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile | |||
@@ -3,7 +3,10 @@ | |||
3 | # $Id$ | 3 | # $Id$ |
4 | # | 4 | # |
5 | # $Log$ | 5 | # $Log$ |
6 | # Revision 1.7 2006/10/22 00:21:56 amiconn | 6 | # Revision 1.8 2006/10/23 14:09:28 markun |
7 | # rearrange compiler options to avoid conflicts with header files on FreeBSD | ||
8 | # | ||
9 | # Revision 1.7 2006-10-22 00:21:56 amiconn | ||
7 | # Speed up build process in general by using internal functions of make instead of spawning sub-shells where possible. | 10 | # Speed up build process in general by using internal functions of make instead of spawning sub-shells where possible. |
8 | # | 11 | # |
9 | # Revision 1.6 2006-09-29 20:04:35 barrywardell | 12 | # Revision 1.6 2006-09-29 20:04:35 barrywardell |
@@ -28,7 +31,7 @@ | |||
28 | 31 | ||
29 | INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 32 | INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ |
30 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) | 33 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) |
31 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 34 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ |
32 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \ | 35 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \ |
33 | -Wno-strict-prototypes -O2 $(PROFILE_OPTS) | 36 | -Wno-strict-prototypes -O2 $(PROFILE_OPTS) |
34 | 37 | ||
diff --git a/apps/plugins/sudoku/Makefile b/apps/plugins/sudoku/Makefile index a59b7e5383..ff2ab2e4a0 100644 --- a/apps/plugins/sudoku/Makefile +++ b/apps/plugins/sudoku/Makefile | |||
@@ -10,7 +10,7 @@ | |||
10 | INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -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 | -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 |