devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Cleaner solution to plugin-included core files.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19664 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2009-01-03 22:40:29 +00:00
parent fc2a59b6d5
commit 985b53e500
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/plugins/doom/SOURCES
View file

@ -60,4 +60,3 @@ i_video.c
w_wad.c w_wad.c
rockdoom.c rockdoom.c
d_deh.c d_deh.c
sscanf.c

7
apps/plugins/doom/doom.make
View file

@ -13,6 +13,7 @@ DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom
ROCKS += $(DOOMBUILDDIR)/doom.rock ROCKS += $(DOOMBUILDDIR)/doom.rock
DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES)
DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c
DOOM_OBJ := $(call c2obj, $(DOOM_SRC)) DOOM_OBJ := $(call c2obj, $(DOOM_SRC))
# add source files to OTHER_SRC to get automatic dependencies # add source files to OTHER_SRC to get automatic dependencies
@ -32,12 +33,6 @@ else
DOOMCFLAGS += -O2 DOOMCFLAGS += -O2
endif endif
$(DOOMBUILDDIR)/sscanf.c: $(FIRMDIR)/common/sscanf.c
$(SILENT)mkdir -p $(dir $@)
$(call PRINTS,CP $<)cp $< $@
$(DOOMBUILDDIR)/sscanf.o: $(DOOMBUILDDIR)/sscanf.c
$(DOOMBUILDDIR)/doom.rock: $(DOOM_OBJ) $(DOOMBUILDDIR)/doom.rock: $(DOOM_OBJ)
# for some reason, this doesn't match the implicit rule in plugins.make, # for some reason, this doesn't match the implicit rule in plugins.make,
# so we have to duplicate the link command here # so we have to duplicate the link command here

8
apps/plugins/rockboy/rockboy.make
View file

@ -11,8 +11,8 @@ ROCKBOY_SRCDIR = $(APPSDIR)/plugins/rockboy
ROCKBOY_OBJDIR = $(BUILDDIR)/apps/plugins/rockboy ROCKBOY_OBJDIR = $(BUILDDIR)/apps/plugins/rockboy
ROCKBOY_SRC := $(call preprocess, $(ROCKBOY_SRCDIR)/SOURCES) ROCKBOY_SRC := $(call preprocess, $(ROCKBOY_SRCDIR)/SOURCES)
ROCKBOY_SRC += $(ROOTDIR)/firmware/common/sscanf.c
ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC)) ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC))
ROCKBOY_OBJ += $(ROCKBOY_OBJDIR)/sscanf.o
OTHER_SRC += $(ROCKBOY_SRC) OTHER_SRC += $(ROCKBOY_SRC)
@ -34,12 +34,6 @@ else
ROCKBOY_OVLFLAGS = $(SHARED_FLAG) # <-- from Makefile ROCKBOY_OVLFLAGS = $(SHARED_FLAG) # <-- from Makefile
endif endif
$(ROCKBOY_OBJDIR)/sscanf.c: $(FIRMDIR)/common/sscanf.c
$(SILENT)mkdir -p $(dir $@)
$(call PRINTS,CP $<)cp $< $@
$(ROCKBOY_OBJDIR)/sscanf.o: $(ROCKBOY_OBJDIR)/sscanf.c
$(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ) $(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ)
$(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@) $(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@)