From 5825b2c84f3b8a0fa9bd243ca5a0dec8141bc573 Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Mon, 23 Oct 2006 14:09:28 +0000 Subject: [PATCH] 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 --- apps/plugins/chessbox/Makefile | 2 +- apps/plugins/doom/Makefile | 7 +++++-- 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 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) -CFLAGS = $(GCCOPTS) -O2 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ +CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN 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 @@ # $Id$ # # $Log$ -# Revision 1.7 2006/10/22 00:21:56 amiconn +# Revision 1.8 2006/10/23 14:09:28 markun +# rearrange compiler options to avoid conflicts with header files on FreeBSD +# +# Revision 1.7 2006-10-22 00:21:56 amiconn # Speed up build process in general by using internal functions of make instead of spawning sub-shells where possible. # # Revision 1.6 2006-09-29 20:04:35 barrywardell @@ -28,7 +31,7 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) -CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \ -Wno-strict-prototypes -O2 $(PROFILE_OPTS) 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 @@ INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) \ -I$(BUILDDIR)/pluginbitmaps -CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ +CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN ifdef APPEXTRA