diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/doom/SOURCES | 1 | ||||
-rw-r--r-- | apps/plugins/doom/doom.make | 7 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.make | 8 |
3 files changed, 2 insertions, 14 deletions
diff --git a/apps/plugins/doom/SOURCES b/apps/plugins/doom/SOURCES index 6ee2d95c96..6cd69faee6 100644 --- a/apps/plugins/doom/SOURCES +++ b/apps/plugins/doom/SOURCES | |||
@@ -60,4 +60,3 @@ i_video.c | |||
60 | w_wad.c | 60 | w_wad.c |
61 | rockdoom.c | 61 | rockdoom.c |
62 | d_deh.c | 62 | d_deh.c |
63 | sscanf.c | ||
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index 666128c432..fc73729c22 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make | |||
@@ -13,6 +13,7 @@ DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom | |||
13 | ROCKS += $(DOOMBUILDDIR)/doom.rock | 13 | ROCKS += $(DOOMBUILDDIR)/doom.rock |
14 | 14 | ||
15 | DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) | 15 | DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) |
16 | DOOM_SRC += $(ROOTDIR)/firmware/common/sscanf.c | ||
16 | DOOM_OBJ := $(call c2obj, $(DOOM_SRC)) | 17 | DOOM_OBJ := $(call c2obj, $(DOOM_SRC)) |
17 | 18 | ||
18 | # add source files to OTHER_SRC to get automatic dependencies | 19 | # add source files to OTHER_SRC to get automatic dependencies |
@@ -32,12 +33,6 @@ else | |||
32 | DOOMCFLAGS += -O2 | 33 | DOOMCFLAGS += -O2 |
33 | endif | 34 | endif |
34 | 35 | ||
35 | $(DOOMBUILDDIR)/sscanf.c: $(FIRMDIR)/common/sscanf.c | ||
36 | $(SILENT)mkdir -p $(dir $@) | ||
37 | $(call PRINTS,CP $<)cp $< $@ | ||
38 | |||
39 | $(DOOMBUILDDIR)/sscanf.o: $(DOOMBUILDDIR)/sscanf.c | ||
40 | |||
41 | $(DOOMBUILDDIR)/doom.rock: $(DOOM_OBJ) | 36 | $(DOOMBUILDDIR)/doom.rock: $(DOOM_OBJ) |
42 | # for some reason, this doesn't match the implicit rule in plugins.make, | 37 | # for some reason, this doesn't match the implicit rule in plugins.make, |
43 | # so we have to duplicate the link command here | 38 | # so we have to duplicate the link command here |
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make index 428211f702..bce549c43c 100644 --- a/apps/plugins/rockboy/rockboy.make +++ b/apps/plugins/rockboy/rockboy.make | |||
@@ -11,8 +11,8 @@ ROCKBOY_SRCDIR = $(APPSDIR)/plugins/rockboy | |||
11 | ROCKBOY_OBJDIR = $(BUILDDIR)/apps/plugins/rockboy | 11 | ROCKBOY_OBJDIR = $(BUILDDIR)/apps/plugins/rockboy |
12 | 12 | ||
13 | ROCKBOY_SRC := $(call preprocess, $(ROCKBOY_SRCDIR)/SOURCES) | 13 | ROCKBOY_SRC := $(call preprocess, $(ROCKBOY_SRCDIR)/SOURCES) |
14 | ROCKBOY_SRC += $(ROOTDIR)/firmware/common/sscanf.c | ||
14 | ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC)) | 15 | ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC)) |
15 | ROCKBOY_OBJ += $(ROCKBOY_OBJDIR)/sscanf.o | ||
16 | 16 | ||
17 | OTHER_SRC += $(ROCKBOY_SRC) | 17 | OTHER_SRC += $(ROCKBOY_SRC) |
18 | 18 | ||
@@ -34,12 +34,6 @@ else | |||
34 | ROCKBOY_OVLFLAGS = $(SHARED_FLAG) # <-- from Makefile | 34 | ROCKBOY_OVLFLAGS = $(SHARED_FLAG) # <-- from Makefile |
35 | endif | 35 | endif |
36 | 36 | ||
37 | $(ROCKBOY_OBJDIR)/sscanf.c: $(FIRMDIR)/common/sscanf.c | ||
38 | $(SILENT)mkdir -p $(dir $@) | ||
39 | $(call PRINTS,CP $<)cp $< $@ | ||
40 | |||
41 | $(ROCKBOY_OBJDIR)/sscanf.o: $(ROCKBOY_OBJDIR)/sscanf.c | ||
42 | |||
43 | $(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ) | 37 | $(ROCKBOY_OUTLDS): $(ROCKBOY_INLDS) $(ROCKBOY_OBJ) |
44 | $(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@) | 38 | $(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@) |
45 | 39 | ||