summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/doom/SOURCES1
-rw-r--r--apps/plugins/doom/doom.make1
-rw-r--r--apps/plugins/lua/Makefile2
-rw-r--r--apps/plugins/plugins.make3
-rw-r--r--apps/plugins/rockboy/SOURCES1
-rw-r--r--apps/plugins/rockboy/rockboy.make1
6 files changed, 5 insertions, 4 deletions
diff --git a/apps/plugins/doom/SOURCES b/apps/plugins/doom/SOURCES
index 6cd69faee6..470cbf159c 100644
--- a/apps/plugins/doom/SOURCES
+++ b/apps/plugins/doom/SOURCES
@@ -1,3 +1,4 @@
1../../../firmware/libc/sscanf.c
1info.c 2info.c
2doomdef.c 3doomdef.c
3doomstat.c 4doomstat.c
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make
index 58a4708819..07b553c454 100644
--- a/apps/plugins/doom/doom.make
+++ b/apps/plugins/doom/doom.make
@@ -13,7 +13,6 @@ DOOMBUILDDIR := $(BUILDDIR)/apps/plugins/doom
13ROCKS += $(DOOMBUILDDIR)/doom.rock 13ROCKS += $(DOOMBUILDDIR)/doom.rock
14 14
15DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES) 15DOOM_SRC := $(call preprocess, $(DOOMSRCDIR)/SOURCES)
16DOOM_SRC += $(ROOTDIR)/firmware/libc/sscanf.c
17DOOM_OBJ := $(call c2obj, $(DOOM_SRC)) 16DOOM_OBJ := $(call c2obj, $(DOOM_SRC))
18 17
19# add source files to OTHER_SRC to get automatic dependencies 18# add source files to OTHER_SRC to get automatic dependencies
diff --git a/apps/plugins/lua/Makefile b/apps/plugins/lua/Makefile
index 09535ac530..8568d79c4c 100644
--- a/apps/plugins/lua/Makefile
+++ b/apps/plugins/lua/Makefile
@@ -55,7 +55,7 @@ ifdef APP_TYPE
55# This is the SDL simulator version 55# This is the SDL simulator version
56 56
57$(OUTPUT): $(OBJS) 57$(OUTPUT): $(OBJS)
58 $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ 58 $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_LDFLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@
59ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) 59ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
60# 'x' must be kept or you'll have "Win32 error 5" 60# 'x' must be kept or you'll have "Win32 error 5"
61# $ fgrep 5 /usr/include/w32api/winerror.h | head -1 61# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 3271c57303..0c667aaf24 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -98,7 +98,8 @@ $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c
98 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ 98 $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@
99 99
100ifdef APP_TYPE 100ifdef APP_TYPE
101 PLUGINLDFLAGS = $(SHARED_FLAG) # <-- from Makefile 101 PLUGINLDFLAGS = $(SHARED_LDFLAG) # <-- from Makefile
102 PLUGINFLAGS += $(SHARED_CFLAGS) # <-- from Makefile
102else 103else
103 PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map 104 PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map
104 OVERLAYLDFLAGS = -T$(OVERLAYREF_LDS) -Wl,--gc-sections -Wl,-Map,$*.refmap 105 OVERLAYLDFLAGS = -T$(OVERLAYREF_LDS) -Wl,--gc-sections -Wl,-Map,$*.refmap
diff --git a/apps/plugins/rockboy/SOURCES b/apps/plugins/rockboy/SOURCES
index 8806b58389..b289db203e 100644
--- a/apps/plugins/rockboy/SOURCES
+++ b/apps/plugins/rockboy/SOURCES
@@ -1,3 +1,4 @@
1../../../firmware/libc/sscanf.c
1cpu.c 2cpu.c
2emu.c 3emu.c
3events.c 4events.c
diff --git a/apps/plugins/rockboy/rockboy.make b/apps/plugins/rockboy/rockboy.make
index d7ae68c0c4..4869cedcbf 100644
--- a/apps/plugins/rockboy/rockboy.make
+++ b/apps/plugins/rockboy/rockboy.make
@@ -11,7 +11,6 @@ ROCKBOY_SRCDIR = $(APPSDIR)/plugins/rockboy
11ROCKBOY_OBJDIR = $(BUILDDIR)/apps/plugins/rockboy 11ROCKBOY_OBJDIR = $(BUILDDIR)/apps/plugins/rockboy
12 12
13ROCKBOY_SRC := $(call preprocess, $(ROCKBOY_SRCDIR)/SOURCES) 13ROCKBOY_SRC := $(call preprocess, $(ROCKBOY_SRCDIR)/SOURCES)
14ROCKBOY_SRC += $(ROOTDIR)/firmware/libc/sscanf.c
15ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC)) 14ROCKBOY_OBJ := $(call c2obj, $(ROCKBOY_SRC))
16 15
17OTHER_SRC += $(ROCKBOY_SRC) 16OTHER_SRC += $(ROCKBOY_SRC)