Support for a colon-separated path in APPEXTRA
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7663 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
d1dc0bd824
commit
dc9e201671
18 changed files with 21 additions and 21 deletions
|
@ -30,8 +30,8 @@ DEFINES = $(DEBUG)
|
||||||
DIRS = .
|
DIRS = .
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
DIRS += $(APPEXTRA)
|
DIRS += $(subst :, ,$(APPEXTRA))
|
||||||
INCLUDES += -I$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \
|
CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \
|
||||||
|
|
|
@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
|
||||||
-DMEM=${MEMORYSIZE} -DCODEC
|
-DMEM=${MEMORYSIZE} -DCODEC
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef SOFTWARECODECS
|
ifdef SOFTWARECODECS
|
||||||
|
|
|
@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
TREMOROPTS = -O2
|
TREMOROPTS = -O2
|
||||||
|
|
|
@ -14,7 +14,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS = $(GCCOPTS) \
|
CFLAGS = $(GCCOPTS) \
|
||||||
|
|
|
@ -12,7 +12,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(BUILDDIR)
|
-I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
NEWGCC=$(shell expr $(GCCNUM) ">" 303)
|
NEWGCC=$(shell expr $(GCCNUM) ">" 303)
|
||||||
|
|
|
@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
A52OPTS =
|
A52OPTS =
|
||||||
|
|
|
@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ALACOPTS = -O3
|
ALACOPTS = -O3
|
||||||
|
|
|
@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
FLACOPTS = -O2
|
FLACOPTS = -O2
|
||||||
|
|
|
@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# NOTE: FPM_ define has been moved to global.h
|
# NOTE: FPM_ define has been moved to global.h
|
||||||
|
|
|
@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
MUSEPACKOPTS = -O2
|
MUSEPACKOPTS = -O2
|
||||||
|
|
|
@ -11,7 +11,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS = $(GCCOPTS) \
|
CFLAGS = $(GCCOPTS) \
|
||||||
|
|
|
@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
|
||||||
-DMEM=${MEMORYSIZE} -DPLUGIN
|
-DMEM=${MEMORYSIZE} -DPLUGIN
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef SOFTWARECODECS
|
ifdef SOFTWARECODECS
|
||||||
|
|
|
@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
|
||||||
-DMEM=${MEMORYSIZE} -DPLUGIN
|
-DMEM=${MEMORYSIZE} -DPLUGIN
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINKFILE := $(OBJDIR)/link.lds
|
LINKFILE := $(OBJDIR)/link.lds
|
||||||
|
|
|
@ -14,7 +14,7 @@ INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS = $(GCCOPTS) \
|
CFLAGS = $(GCCOPTS) \
|
||||||
|
|
|
@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
|
||||||
-DMEM=${MEMORYSIZE} -DPLUGIN
|
-DMEM=${MEMORYSIZE} -DPLUGIN
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINKFILE := $(OBJDIR)/link.lds
|
LINKFILE := $(OBJDIR)/link.lds
|
||||||
|
|
|
@ -13,7 +13,7 @@ CFLAGS = $(GCCOPTS) -O3 $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \
|
||||||
-DMEM=${MEMORYSIZE} -DPLUGIN
|
-DMEM=${MEMORYSIZE} -DPLUGIN
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINKFILE := $(OBJDIR)/link.lds
|
LINKFILE := $(OBJDIR)/link.lds
|
||||||
|
|
|
@ -22,8 +22,8 @@ SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARG
|
||||||
DIRS = .
|
DIRS = .
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
DIRS += $(APPEXTRA)
|
DIRS += $(subst :, ,$(APPEXTRA))
|
||||||
INCLUDES += -I$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef VERSION
|
ifndef VERSION
|
||||||
|
|
|
@ -22,8 +22,8 @@ SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARG
|
||||||
DIRS = .
|
DIRS = .
|
||||||
|
|
||||||
ifdef APPEXTRA
|
ifdef APPEXTRA
|
||||||
DIRS += $(APPEXTRA)
|
DIRS += $(subst :, ,$(APPEXTRA))
|
||||||
INCLUDES += -I$(APPEXTRA)
|
INCLUDES += $(patsubst %,-I%,$(subst :, ,$(APPEXTRA)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \
|
CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(DEFINES) \
|
||||||
|
|
Loading…
Reference in a new issue