diff options
Diffstat (limited to 'apps/plugins/zxbox')
-rw-r--r-- | apps/plugins/zxbox/Makefile | 84 | ||||
-rw-r--r-- | apps/plugins/zxbox/spmain.c | 2 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox.make | 57 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxvid_com.h | 2 |
4 files changed, 59 insertions, 86 deletions
diff --git a/apps/plugins/zxbox/Makefile b/apps/plugins/zxbox/Makefile deleted file mode 100644 index d7862c514b..0000000000 --- a/apps/plugins/zxbox/Makefile +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # | ||
8 | OPT_FLAGS=-O3 -funroll-loops | ||
9 | |||
10 | INCLUDES = -I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | ||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(OUTDIR) -I$(BUILDDIR) -I. $(TARGET_INC) | ||
12 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(EXTRA_DEFINES) \ | ||
13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN $(OPT_FLAGS) $(PROFILE_OPTS) | ||
14 | |||
15 | ifdef APPEXTRA | ||
16 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | ||
17 | endif | ||
18 | |||
19 | LINKFILE := $(OBJDIR)/link.lds | ||
20 | DEPFILE = $(OBJDIR)/dep-zxbox | ||
21 | |||
22 | # This sets up 'SRC' based on the files mentioned in SOURCES | ||
23 | include $(TOOLSDIR)/makesrc.inc | ||
24 | |||
25 | SOURCES = $(SRC) | ||
26 | OBJS2 := $(SRC:%.c=$(OBJDIR)/%.o) | ||
27 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | ||
28 | DIRS = . | ||
29 | |||
30 | ifndef SIMVER | ||
31 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | ||
32 | LDS := archos.lds | ||
33 | OUTPUT = $(OUTDIR)/zxbox.ovl | ||
34 | else ## iRiver/iPod/... targets | ||
35 | LDS := ../plugin.lds | ||
36 | OUTPUT = $(OUTDIR)/zxbox.rock | ||
37 | endif | ||
38 | else ## simulators | ||
39 | OUTPUT = $(OUTDIR)/zxbox.rock | ||
40 | endif | ||
41 | |||
42 | all: $(OUTPUT) | ||
43 | |||
44 | ifndef SIMVER | ||
45 | $(OBJDIR)/zxbox.elf: $(OBJS) $(LINKFILE) | ||
46 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | ||
47 | -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/zxbox.map | ||
48 | |||
49 | $(OUTPUT): $(OBJDIR)/zxbox.elf | ||
50 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ | ||
51 | else | ||
52 | |||
53 | ifeq ($(SIMVER), sdl) | ||
54 | ################################################### | ||
55 | # This is the SDL simulator version | ||
56 | |||
57 | $(OUTPUT): $(OBJS) | ||
58 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
59 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | ||
60 | # 'x' must be kept or you'll have "Win32 error 5" | ||
61 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | ||
62 | # #define ERROR_ACCESS_DENIED 5L | ||
63 | else | ||
64 | @chmod -x $@ | ||
65 | endif | ||
66 | |||
67 | endif | ||
68 | endif # end of simulator section | ||
69 | |||
70 | |||
71 | include $(TOOLSDIR)/make.inc | ||
72 | |||
73 | # MEMORYSIZE should be passed on to this makefile with the chosen memory size | ||
74 | # given in number of MB | ||
75 | $(LINKFILE): $(LDS) | ||
76 | $(call PRINTS,build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \ | ||
77 | $(DEFINES) -E -P - >$@ | ||
78 | |||
79 | clean: | ||
80 | $(call PRINTS,cleaning zxbox)rm -rf $(OBJDIR)/zxbox | ||
81 | $(SILENT)rm -f $(OBJDIR)/zxbox.* $(DEPFILE) | ||
82 | |||
83 | -include $(DEPFILE) | ||
84 | |||
diff --git a/apps/plugins/zxbox/spmain.c b/apps/plugins/zxbox/spmain.c index 6c586566f9..bc5df48059 100644 --- a/apps/plugins/zxbox/spmain.c +++ b/apps/plugins/zxbox/spmain.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <stdlib.h> | 43 | #include <stdlib.h> |
44 | #include <errno.h> | 44 | #include <errno.h> |
45 | #ifdef USE_GREY | 45 | #ifdef USE_GREY |
46 | #include "../lib/grey.h" | 46 | #include "lib/grey.h" |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #include "zxbox_keyb.h" | 49 | #include "zxbox_keyb.h" |
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make new file mode 100644 index 0000000000..e617ba3a12 --- /dev/null +++ b/apps/plugins/zxbox/zxbox.make | |||
@@ -0,0 +1,57 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $ | ||
8 | # | ||
9 | |||
10 | ZXBOX_SRCDIR = $(APPSDIR)/plugins/zxbox | ||
11 | ZXBOX_OBJDIR = $(BUILDDIR)/apps/plugins/zxbox | ||
12 | |||
13 | ZXBOX_SRC := $(call preprocess, $(ZXBOX_SRCDIR)/SOURCES) | ||
14 | ZXBOX_OBJ := $(call c2obj, $(ZXBOX_SRC)) | ||
15 | |||
16 | OTHER_SRC += $(ZXBOX_SRC) | ||
17 | |||
18 | ifndef SIMVER | ||
19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | ||
20 | ## archos recorder targets | ||
21 | ZXBOX_INLDS := $(ZXBOX_SRCDIR)/archos.lds | ||
22 | ROCKS += $(ZXBOX_OBJDIR)/zxbox.ovl | ||
23 | else | ||
24 | ### all other targets | ||
25 | ZXBOX_INLDS := $(APPSDIR)/plugins/plugin.lds | ||
26 | ROCKS += $(ZXBOX_OBJDIR)/zxbox.rock | ||
27 | endif | ||
28 | else | ||
29 | ### simulator | ||
30 | ROCKS += $(ZXBOX_OBJDIR)/zxbox.rock | ||
31 | endif | ||
32 | |||
33 | ZXBOXFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O3 -funroll-loops | ||
34 | |||
35 | ifdef SIMVER | ||
36 | ZXBOX_LDFLAGS = $(SHARED_FLAG) # <-- from Makefile | ||
37 | else | ||
38 | ZXBOX_OUTLDS = $(ZXBOX_OBJDIR)/zxbox.lds | ||
39 | ZXBOX_LDFLAGS = -T$(ZXBOX_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(BUILDDIR)/$*.map | ||
40 | endif | ||
41 | |||
42 | $(ZXBOX_OUTLDS): $(ZXBOX_INLDS) $(ZXBOX_OBJ) | ||
43 | $(call PRINTS,PP $(<F))$(call preprocess2file,$<,$@) | ||
44 | |||
45 | $(ZXBOX_OBJDIR)/zxbox.rock: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) | ||
46 | |||
47 | $(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) $(PLUGINBITMAPLIB) $(PLUGINLIB) | ||
48 | $(SILENT)$(CC) $(PLUGINFLAGS) -o $(ZXBOX_OBJDIR)/$*.elf \ | ||
49 | $(filter %.o, $^) \ | ||
50 | $(filter %.a, $^) \ | ||
51 | -lgcc $(ZXBOX_LDFLAGS) | ||
52 | $(call PRINTS,LD $(@F))$(OC) -O binary $(ZXBOX_OBJDIR)/$*.elf $@ | ||
53 | |||
54 | # special pattern rule for compiling zxbox with extra flags | ||
55 | $(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(ZXBOX_SRCDIR)/zxbox.make | ||
56 | $(SILENT)mkdir -p $(dir $@) | ||
57 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(ZXBOXFLAGS) -c $< -o $@ | ||
diff --git a/apps/plugins/zxbox/zxvid_com.h b/apps/plugins/zxbox/zxvid_com.h index 2ef67c6385..1e23ca03e3 100644 --- a/apps/plugins/zxbox/zxvid_com.h +++ b/apps/plugins/zxbox/zxvid_com.h | |||
@@ -3,7 +3,7 @@ | |||
3 | #include "zxconfig.h" | 3 | #include "zxconfig.h" |
4 | 4 | ||
5 | #ifdef USE_GREY | 5 | #ifdef USE_GREY |
6 | #include "../lib/grey.h" | 6 | #include "lib/grey.h" |
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | #include "spscr_p.h" | 9 | #include "spscr_p.h" |