1 files changed, 33 insertions, 7 deletions

diff --git a/apps/plugins/goban/goban.make b/apps/plugins/goban/goban.make
index f3f96ff5c6..b8866fbc4f 100644
--- a/apps/plugins/goban/goban.make
+++ b/apps/plugins/goban/goban.make
@@ -8,15 +8,41 @@
 #
 
 
-GOBANSRCDIR := $(APPSDIR)/plugins/goban
-GOBANBUILDDIR := $(BUILDDIR)/apps/plugins/goban
+GOBAN_SRCDIR := $(APPSDIR)/plugins/goban
+GOBAN_BUILDDIR := $(BUILDDIR)/apps/plugins/goban
 
-ROCKS += $(GOBANBUILDDIR)/goban.rock
-
-
-GOBAN_SRC := $(call preprocess, $(GOBANSRCDIR)/SOURCES)
+GOBAN_SRC := $(call preprocess, $(GOBAN_SRCDIR)/SOURCES)
 GOBAN_OBJ := $(call c2obj, $(GOBAN_SRC))
 
 OTHER_SRC += $(GOBAN_SRC)
 
-$(GOBANBUILDDIR)/goban.rock: $(GOBAN_OBJ)
+ifndef SIMVER
+ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET)))))
+    ### archos recorder targets
+    GOBAN_INLDS := $(GOBAN_SRCDIR)/archos.lds
+    ROCKS += $(GOBAN_BUILDDIR)/goban.ovl
+else
+    ### all other targets
+    GOBAN_INLDS := $(APPSDIR)/plugins/plugin.lds
+    ROCKS += $(GOBAN_BUILDDIR)/goban.rock
+endif
+    GOBAN_OVLFLAGS = -T$(GOBAN_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map
+    GOBAN_OUTLDS = $(GOBAN_BUILDDIR)/goban.lds
+else
+    ### simulator
+    ROCKS += $(GOBAN_BUILDDIR)/goban.rock
+    GOBAN_OVLFLAGS = $(SHARED_FLAG) # <-- from Makefile
+endif
+
+$(GOBAN_OUTLDS): $(GOBAN_INLDS) $(GOBAN_OBJ)
+        $(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@)
+
+$(GOBAN_BUILDDIR)/goban.rock: $(GOBAN_OBJ) $(GOBAN_OUTLDS)
+
+$(GOBAN_BUILDDIR)/goban.ovl: $(GOBAN_OBJ) $(GOBAN_OUTLDS)
+        $(SILENT)$(CC) $(PLUGINFLAGS) -o $(basename $@).elf \
+                $(filter %.o, $^) \
+                $(filter %.a, $^) \
+                -lgcc $(GOBAN_OVLFLAGS)
+        $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@
+