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:
parent
f66c303467
commit
c6b3d38a15
221 changed files with 2081 additions and 3657 deletions
|
@ -1,112 +0,0 @@
|
|||
# __________ __ ___.
|
||||
# Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
# \/ \/ \/ \/ \/
|
||||
# $$Id: $$
|
||||
#
|
||||
|
||||
INCLUDES = -I$(APPSDIR) -I.. -I. -I$(APPSDIR)/plugins/lib \
|
||||
$(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export \
|
||||
-I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) \
|
||||
-I$(BUILDDIR)/pluginbitmaps
|
||||
CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \
|
||||
-DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN
|
||||
|
||||
ifdef APPEXTRA
|
||||
INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
|
||||
endif
|
||||
|
||||
LINKFILE := $(OBJDIR)/link.lds
|
||||
DEPFILE = $(OBJDIR)/dep-clock
|
||||
|
||||
# This sets up 'SRC' based on the files mentioned in SOURCES
|
||||
include $(TOOLSDIR)/makesrc.inc
|
||||
|
||||
SOURCES = $(SRC)
|
||||
OBJS := $(SRC:%.c=$(OBJDIR)/%.o)
|
||||
DIRS = .
|
||||
|
||||
ifndef SIMVER
|
||||
LDS := ../plugin.lds
|
||||
OUTPUT = $(OUTDIR)/clock.rock
|
||||
else ## simulators
|
||||
OUTPUT = $(OUTDIR)/clock.rock
|
||||
endif
|
||||
|
||||
all: $(OUTPUT)
|
||||
|
||||
ifndef SIMVER
|
||||
$(OBJDIR)/clock.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS)
|
||||
$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
|
||||
$(LINKBITMAPS) -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/clock.map
|
||||
|
||||
$(OUTPUT): $(OBJDIR)/clock.elf
|
||||
$(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@
|
||||
else
|
||||
|
||||
ifeq ($(SIMVER), x11)
|
||||
###################################################
|
||||
# This is the X11 simulator version
|
||||
|
||||
$(OUTPUT): $(OBJS)
|
||||
$(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -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
|
||||
|
||||
else # end of x11-simulator
|
||||
ifeq ($(SIMVER), sdl)
|
||||
###################################################
|
||||
# This is the SDL simulator version
|
||||
|
||||
$(OUTPUT): $(OBJS)
|
||||
$(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin $(LINKBITMAPS) -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
|
||||
|
||||
else # end of sdl-simulator
|
||||
###################################################
|
||||
# This is the win32 simulator version
|
||||
DLLTOOLFLAGS = --export-all
|
||||
DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
|
||||
|
||||
$(OUTPUT): $(OBJS)
|
||||
$(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
|
||||
$(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
|
||||
$(BUILDDIR)/libplugin.a $(BITMAPLIBS) -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 # end of win32-simulator
|
||||
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 clock)rm -rf $(OBJDIR)/clock
|
||||
$(SILENT)rm -f $(OBJDIR)/clock.* $(DEPFILE)
|
||||
|
||||
-include $(DEPFILE)
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
#include "plugin.h"
|
||||
#include "time.h"
|
||||
#include "pluginlib_actions.h"
|
||||
#include "xlcd.h"
|
||||
#include "lib/pluginlib_actions.h"
|
||||
#include "lib/xlcd.h"
|
||||
|
||||
#include "clock.h"
|
||||
#include "clock_counter.h"
|
||||
|
|
21
apps/plugins/clock/clock.make
Normal file
21
apps/plugins/clock/clock.make
Normal file
|
@ -0,0 +1,21 @@
|
|||
# __________ __ ___.
|
||||
# Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
# \/ \/ \/ \/ \/
|
||||
# $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $
|
||||
#
|
||||
|
||||
CLOCKSRCDIR := $(APPSDIR)/plugins/clock
|
||||
CLOCKBUILDDIR := $(BUILDDIR)/apps/plugins/clock
|
||||
|
||||
ROCKS += $(CLOCKBUILDDIR)/clock.rock
|
||||
|
||||
CLOCK_SRC := $(call preprocess, $(CLOCKSRCDIR)/SOURCES)
|
||||
CLOCK_OBJ := $(call c2obj, $(CLOCK_SRC))
|
||||
|
||||
# add source files to OTHER_SRC to get automatic dependencies
|
||||
OTHER_SRC += $(CLOCK_SRC)
|
||||
|
||||
$(CLOCKBUILDDIR)/clock.rock: $(CLOCK_OBJ)
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef _CLOCK_BITMAP_STRINGS_
|
||||
#define _CLOCK_BITMAP_STRINGS_
|
||||
#include "plugin.h"
|
||||
#include "picture.h"
|
||||
#include "lib/picture.h"
|
||||
|
||||
void draw_string(struct screen* display, const struct picture* bitmaps,
|
||||
char* str, int x, int y);
|
||||
|
|
|
@ -23,24 +23,24 @@
|
|||
#include "clock_bitmaps.h"
|
||||
|
||||
/* bitmaps */
|
||||
#include "clock_binary.h"
|
||||
#include "clock_digits.h"
|
||||
#include "clock_smalldigits.h"
|
||||
#include "clock_segments.h"
|
||||
#include "clock_smallsegments.h"
|
||||
#include "pluginbitmaps/clock_binary.h"
|
||||
#include "pluginbitmaps/clock_digits.h"
|
||||
#include "pluginbitmaps/clock_smalldigits.h"
|
||||
#include "pluginbitmaps/clock_segments.h"
|
||||
#include "pluginbitmaps/clock_smallsegments.h"
|
||||
|
||||
#include "clock_logo.h"
|
||||
#include "clock_messages.h"
|
||||
#include "pluginbitmaps/clock_logo.h"
|
||||
#include "pluginbitmaps/clock_messages.h"
|
||||
|
||||
#if NB_SCREENS==2
|
||||
#include "clock_binary_remote.h"
|
||||
#include "clock_digits_remote.h"
|
||||
#include "clock_smalldigits_remote.h"
|
||||
#include "clock_segments_remote.h"
|
||||
#include "clock_smallsegments_remote.h"
|
||||
#include "pluginbitmaps/clock_binary_remote.h"
|
||||
#include "pluginbitmaps/clock_digits_remote.h"
|
||||
#include "pluginbitmaps/clock_smalldigits_remote.h"
|
||||
#include "pluginbitmaps/clock_segments_remote.h"
|
||||
#include "pluginbitmaps/clock_smallsegments_remote.h"
|
||||
|
||||
#include "clock_logo_remote.h"
|
||||
#include "clock_messages_remote.h"
|
||||
#include "pluginbitmaps/clock_logo_remote.h"
|
||||
#include "pluginbitmaps/clock_messages_remote.h"
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#ifndef _CLOCK_BITMAPS_
|
||||
#define _CLOCK_BITMAPS_
|
||||
#include "picture.h"
|
||||
#include "lib/picture.h"
|
||||
|
||||
extern const struct picture logos[];
|
||||
extern const struct picture messages[];
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define _CLOCK_MESSAGE_
|
||||
#include "clock.h"
|
||||
#include "plugin.h"
|
||||
#include "picture.h"
|
||||
#include "lib/picture.h"
|
||||
|
||||
struct counter{
|
||||
int ticks_at_last_unpause;/* to count the time from last pause to now */
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include "clock_draw_analog.h"
|
||||
#include "xlcd.h"
|
||||
#include "fixedpoint.h"
|
||||
#include "lib/xlcd.h"
|
||||
#include "lib/fixedpoint.h"
|
||||
#include "clock_bitmaps.h"
|
||||
#include "clock_bitmap_strings.h"
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "clock_draw_binary.h"
|
||||
#include "clock_bitmap_strings.h"
|
||||
#include "clock_bitmaps.h"
|
||||
#include "picture.h"
|
||||
#include "lib/picture.h"
|
||||
|
||||
const struct picture* binary_skin[]={binary,digits,segments};
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "clock_draw_digital.h"
|
||||
#include "clock_bitmap_strings.h"
|
||||
#include "clock_bitmaps.h"
|
||||
#include "picture.h"
|
||||
#include "lib/picture.h"
|
||||
|
||||
const struct picture* digits_skin[]={digits,segments};
|
||||
const struct picture* smalldigits_skin[]={smalldigits,smallsegments};
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "clock_bitmaps.h"
|
||||
#include "clock_draw.h"
|
||||
#include "clock_settings.h"
|
||||
#include "picture.h"
|
||||
#include "lib/picture.h"
|
||||
|
||||
static int max_skin[]={
|
||||
[ANALOG]=2,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue