From c849219370fd65be2167a24a9f06f03bc1284ac1 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Thu, 27 Jul 2006 13:27:31 +0000 Subject: Moved the X5 button driver to the target tree git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10339 a1c6a512-1295-4272-9138-f99709370657 --- apps/Makefile | 2 +- apps/codecs/lib/Makefile | 2 +- apps/plugins/Makefile | 2 +- apps/plugins/chessbox/Makefile | 2 +- apps/plugins/databox/Makefile | 2 +- apps/plugins/doom/Makefile | 7 +++++-- apps/plugins/lib/Makefile | 2 +- apps/plugins/pacbox/Makefile | 2 +- apps/plugins/rockboy/Makefile | 2 +- apps/plugins/searchengine/Makefile | 2 +- apps/plugins/sudoku/Makefile | 2 +- 11 files changed, 15 insertions(+), 12 deletions(-) (limited to 'apps') diff --git a/apps/Makefile b/apps/Makefile index 0fd52bb135..53a0d373bb 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -7,7 +7,7 @@ # $Id$ # -INCLUDES= -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDIR) \ +INCLUDES= $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDIR) \ -I$(BUILDDIR)/bitmaps -I$(OBJDIR) DEPFILE = $(OBJDIR)/dep-apps diff --git a/apps/codecs/lib/Makefile b/apps/codecs/lib/Makefile index 18f478c474..865e3b5e53 100644 --- a/apps/codecs/lib/Makefile +++ b/apps/codecs/lib/Makefile @@ -10,7 +10,7 @@ # ../.. for the codec.h in the apps dir # .. for stuff in the codecs dir # . for stuff in the codeclib dir -INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +INCLUDES=-I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(BUILDDIR) ifdef APPEXTRA diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 2dd8ab2e8d..0b2974f565 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -7,7 +7,7 @@ # $Id$ # -INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ +INCLUDES = $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) \ -I$(BUILDDIR)/pluginbitmaps CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ diff --git a/apps/plugins/chessbox/Makefile b/apps/plugins/chessbox/Makefile index eb2df44e11..66381bea12 100644 --- a/apps/plugins/chessbox/Makefile +++ b/apps/plugins/chessbox/Makefile @@ -7,7 +7,7 @@ # $Id$ # -INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +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) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile index 1205234d38..507a861f9b 100644 --- a/apps/plugins/databox/Makefile +++ b/apps/plugins/databox/Makefile @@ -7,7 +7,7 @@ # $Id$ # -INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile index 0eef697292..b79f5be7b0 100644 --- a/apps/plugins/doom/Makefile +++ b/apps/plugins/doom/Makefile @@ -3,7 +3,10 @@ # $Id$ # # $Log$ -# Revision 1.3 2006/04/14 21:07:56 kkurbjun +# Revision 1.4 2006/07/27 13:27:19 linus +# Moved the X5 button driver to the target tree +# +# Revision 1.3 2006-04-14 21:07:56 kkurbjun # Start of profiling support for doom. # # Revision 1.2 2006-03-29 21:16:45 kkurbjun @@ -14,7 +17,7 @@ # # -INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +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) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN \ diff --git a/apps/plugins/lib/Makefile b/apps/plugins/lib/Makefile index 916c63203d..8482b1f1dd 100644 --- a/apps/plugins/lib/Makefile +++ b/apps/plugins/lib/Makefile @@ -10,7 +10,7 @@ # ../.. for the plugin.h in the apps dir # .. for stuff in the plugins dir # . for stuff in the pluginlib dir -INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +INCLUDES=-I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) ifdef APPEXTRA diff --git a/apps/plugins/pacbox/Makefile b/apps/plugins/pacbox/Makefile index 0b7f4b9e15..4a5442c25f 100644 --- a/apps/plugins/pacbox/Makefile +++ b/apps/plugins/pacbox/Makefile @@ -7,7 +7,7 @@ # $Id$ # -INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile index 694dcde251..39e684e143 100644 --- a/apps/plugins/rockboy/Makefile +++ b/apps/plugins/rockboy/Makefile @@ -7,7 +7,7 @@ # $Id$ # -INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) CFLAGS = $(INCLUDES) $(GCCOPTS) -O2 $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -finline-functions diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index 21b53cbefe..92e9f03991 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile @@ -7,7 +7,7 @@ # $Id$ # -INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +INCLUDES = -I$(APPSDIR) -I.. -I. $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) CFLAGS = $(INCLUDES) $(GCCOPTS) -O3 $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN diff --git a/apps/plugins/sudoku/Makefile b/apps/plugins/sudoku/Makefile index 9b9c1c6b2e..eef05124f9 100644 --- a/apps/plugins/sudoku/Makefile +++ b/apps/plugins/sudoku/Makefile @@ -7,7 +7,7 @@ # $Id$ # -INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ +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) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN -- cgit v1.2.3