forked from len0rd/rockbox
New makefile solution: A single invocation of 'make' to build the entire tree. Fully controlled dependencies give faster and more correct recompiles.
Many #include lines adjusted to conform to the new standards. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19146 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg
parent
f66c303467
commit
c6b3d38a15
221 changed files with 2081 additions and 3657 deletions
|
|
@ -1,84 +0,0 @@
|
|||
# __________ __ ___.
|
||||
# Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
# \/ \/ \/ \/ \/
|
||||
#
|
||||
OPT_FLAGS=-O3 -funroll-loops
|
||||
|
||||
INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) -I. $(TARGET_INC)
|
||||
CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
|
||||
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN $(OPT_FLAGS) $(PROFILE_OPTS)
|
||||
|
||||
ifdef APPEXTRA
|
||||
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||
endif
|
||||
|
||||
LINKFILE := $(OBJDIR)/link.lds
|
||||
DEPFILE = $(OBJDIR)/dep-zxbox
|
||||
|
||||
# This sets up 'SRC' based on the files mentioned in SOURCES
|
||||
include $(TOOLSDIR)/makesrc.inc
|
||||
|
||||
SOURCES = $(SRC)
|
||||
OBJS2 := $(SRC:%.c=$(OBJDIR)/%.o)
|
||||
OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2))
|
||||
DIRS = .
|
||||
|
||||
ifndef SIMVER
|
||||
ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET)))))
|
||||
LDS := archos.lds
|
||||
OUTPUT = $(OUTDIR)/zxbox.ovl
|
||||
else ## iRiver/iPod/... targets
|
||||
LDS := ../plugin.lds
|
||||
OUTPUT = $(OUTDIR)/zxbox.rock
|
||||
endif
|
||||
else ## simulators
|
||||
OUTPUT = $(OUTDIR)/zxbox.rock
|
||||
endif
|
||||
|
||||
all: $(OUTPUT)
|
||||
|
||||
ifndef SIMVER
|
||||
$(OBJDIR)/zxbox.elf: $(OBJS) $(LINKFILE)
|
||||
$(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
|
||||
-T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/zxbox.map
|
||||
|
||||
$(OUTPUT): $(OBJDIR)/zxbox.elf
|
||||
$(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@
|
||||
else
|
||||
|
||||
ifeq ($(SIMVER), sdl)
|
||||
###################################################
|
||||
# This is the SDL simulator version
|
||||
|
||||
$(OUTPUT): $(OBJS)
|
||||
$(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@
|
||||
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
|
||||
# 'x' must be kept or you'll have "Win32 error 5"
|
||||
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
|
||||
# #define ERROR_ACCESS_DENIED 5L
|
||||
else
|
||||
@chmod -x $@
|
||||
endif
|
||||
|
||||
endif
|
||||
endif # end of simulator section
|
||||
|
||||
|
||||
include $(TOOLSDIR)/make.inc
|
||||
|
||||
# MEMORYSIZE should be passed on to this makefile with the chosen memory size
|
||||
# given in number of MB
|
||||
$(LINKFILE): $(LDS)
|
||||
$(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
|
||||
$(DEFINES) -E -P - >$@
|
||||
|
||||
clean:
|
||||
$(call PRINTS,cleaning zxbox)rm -rf $(OBJDIR)/zxbox
|
||||
$(SILENT)rm -f $(OBJDIR)/zxbox.* $(DEPFILE)
|
||||
|
||||
-include $(DEPFILE)
|
||||
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#ifdef USE_GREY
|
||||
#include "../lib/grey.h"
|
||||
#include "lib/grey.h"
|
||||
#endif
|
||||
|
||||
#include "zxbox_keyb.h"
|
||||
|
|
|
|||
57
apps/plugins/zxbox/zxbox.make
Normal file
57
apps/plugins/zxbox/zxbox.make
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
# __________ __ ___.
|
||||
# Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
# \/ \/ \/ \/ \/
|
||||
# $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $
|
||||
#
|
||||
|
||||
ZXBOX_SRCDIR = $(APPSDIR)/plugins/zxbox
|
||||
ZXBOX_OBJDIR = $(BUILDDIR)/apps/plugins/zxbox
|
||||
|
||||
ZXBOX_SRC := $(call preprocess, $(ZXBOX_SRCDIR)/SOURCES)
|
||||
ZXBOX_OBJ := $(call c2obj, $(ZXBOX_SRC))
|
||||
|
||||
OTHER_SRC += $(ZXBOX_SRC)
|
||||
|
||||
ifndef SIMVER
|
||||
ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET)))))
|
||||
## archos recorder targets
|
||||
ZXBOX_INLDS := $(ZXBOX_SRCDIR)/archos.lds
|
||||
ROCKS += $(ZXBOX_OBJDIR)/zxbox.ovl
|
||||
else
|
||||
### all other targets
|
||||
ZXBOX_INLDS := $(APPSDIR)/plugins/plugin.lds
|
||||
ROCKS += $(ZXBOX_OBJDIR)/zxbox.rock
|
||||
endif
|
||||
else
|
||||
### simulator
|
||||
ROCKS += $(ZXBOX_OBJDIR)/zxbox.rock
|
||||
endif
|
||||
|
||||
ZXBOXFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O3 -funroll-loops
|
||||
|
||||
ifdef SIMVER
|
||||
ZXBOX_LDFLAGS = $(SHARED_FLAG) # <-- from Makefile
|
||||
else
|
||||
ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.lds
|
||||
ZXBOX_LDFLAGS = -T$(ZXBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/$*.map
|
||||
endif
|
||||
|
||||
$(ZXBOX_OUTLDS): $(ZXBOX_INLDS) $(ZXBOX_OBJ)
|
||||
$(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@)
|
||||
|
||||
$(ZXBOX_OBJDIR)/zxbox.rock: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB)
|
||||
|
||||
$(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) $(PLUGINLIB)
|
||||
$(SILENT)$(CC) $(PLUGINFLAGS) -o $(ZXBOX_OBJDIR)/$*.elf \
|
||||
$(filter %.o, $^) \
|
||||
$(filter %.a, $^) \
|
||||
-lgcc $(ZXBOX_LDFLAGS)
|
||||
$(call PRINTS,LD $(@F))$(OC) -O binary $(ZXBOX_OBJDIR)/$*.elf $@
|
||||
|
||||
# special pattern rule for compiling zxbox with extra flags
|
||||
$(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(ZXBOX_SRCDIR)/zxbox.make
|
||||
$(SILENT)mkdir -p $(dir $@)
|
||||
$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(ZXBOXFLAGS) -c $< -o $@
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
#include "zxconfig.h"
|
||||
|
||||
#ifdef USE_GREY
|
||||
#include "../lib/grey.h"
|
||||
#include "lib/grey.h"
|
||||
#endif
|
||||
|
||||
#include "spscr_p.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue