diff options
-rw-r--r-- | apps/codecs/codecs.make | 6 | ||||
-rw-r--r-- | apps/codecs/lib/tlsf/libtlsf.make | 2 | ||||
-rw-r--r-- | apps/codecs/libwmapro/libwmapro.make | 2 | ||||
-rw-r--r-- | apps/plugins/doom/doom.make | 2 | ||||
-rw-r--r-- | apps/plugins/goban/goban.make | 2 | ||||
-rw-r--r-- | apps/plugins/lua/Makefile | 6 | ||||
-rw-r--r-- | apps/plugins/lua/lua.make | 2 | ||||
-rw-r--r-- | apps/plugins/pdbox/pdbox.make | 4 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.make | 2 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 6 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox.make | 2 | ||||
-rw-r--r-- | firmware/firmware.make | 2 | ||||
-rwxr-xr-x | tools/configure | 18 | ||||
-rw-r--r-- | tools/database/Makefile | 104 | ||||
-rw-r--r-- | tools/root.make | 8 | ||||
-rw-r--r-- | uisimulator/common/Makefile | 2 |
16 files changed, 99 insertions, 71 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index aab23b01a2..c137426591 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -47,7 +47,7 @@ include $(APPSDIR)/codecs/libtta/libtta.make | |||
47 | CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ | 47 | CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \ |
48 | -I$(APPSDIR)/codecs/lib -DCODEC | 48 | -I$(APPSDIR)/codecs/lib -DCODEC |
49 | 49 | ||
50 | ifndef SIMVER | 50 | ifndef APP_TYPE |
51 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h | 51 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h |
52 | CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file | 52 | CODEC_LDS := $(APPSDIR)/plugins/plugin.lds # codecs and plugins use same file |
53 | CODECLINK_LDS := $(CODECDIR)/codec.link | 53 | CODECLINK_LDS := $(CODECDIR)/codec.link |
@@ -115,7 +115,7 @@ $(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S | |||
115 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ | 115 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \ |
116 | -I$(dir $<) $(CODECFLAGS) -c $< -o $@ | 116 | -I$(dir $<) $(CODECFLAGS) -c $< -o $@ |
117 | 117 | ||
118 | ifdef SIMVER | 118 | ifdef APP_TYPE |
119 | CODECLDFLAGS = $(SHARED_FLAG) # <-- from Makefile | 119 | CODECLDFLAGS = $(SHARED_FLAG) # <-- from Makefile |
120 | else | 120 | else |
121 | CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map | 121 | CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map |
@@ -135,7 +135,7 @@ $(CODECDIR)/%.codec: $(CODECDIR)/%.o | |||
135 | $(filter %.o, $^) \ | 135 | $(filter %.o, $^) \ |
136 | $(filter %.a, $+) \ | 136 | $(filter %.a, $+) \ |
137 | -lgcc $(CODECLDFLAGS) | 137 | -lgcc $(CODECLDFLAGS) |
138 | ifdef SIMVER | 138 | ifdef APP_TYPE |
139 | $(SILENT)cp $(CODECDIR)/$*.elf $@ | 139 | $(SILENT)cp $(CODECDIR)/$*.elf $@ |
140 | else | 140 | else |
141 | $(SILENT)$(OC) -O binary $(CODECDIR)/$*.elf $@ | 141 | $(SILENT)$(OC) -O binary $(CODECDIR)/$*.elf $@ |
diff --git a/apps/codecs/lib/tlsf/libtlsf.make b/apps/codecs/lib/tlsf/libtlsf.make index 464487f87f..7d37d29b21 100644 --- a/apps/codecs/lib/tlsf/libtlsf.make +++ b/apps/codecs/lib/tlsf/libtlsf.make | |||
@@ -18,7 +18,7 @@ $(TLSFLIB): $(TLSFLIB_OBJ) | |||
18 | 18 | ||
19 | TLSFLIBFLAGS = $(CODECFLAGS) -ffunction-sections | 19 | TLSFLIBFLAGS = $(CODECFLAGS) -ffunction-sections |
20 | 20 | ||
21 | ifdef SIMVER | 21 | ifdef APP_TYPE |
22 | TLSFLIBFLAGS += -DTLSF_STATISTIC=1 | 22 | TLSFLIBFLAGS += -DTLSF_STATISTIC=1 |
23 | endif | 23 | endif |
24 | 24 | ||
diff --git a/apps/codecs/libwmapro/libwmapro.make b/apps/codecs/libwmapro/libwmapro.make index 42086a637a..0e8df7e9cb 100644 --- a/apps/codecs/libwmapro/libwmapro.make +++ b/apps/codecs/libwmapro/libwmapro.make | |||
@@ -17,7 +17,7 @@ $(WMAPROLIB): $(WMAPROLIB_OBJ) | |||
17 | $(SILENT)$(shell rm -f $@) | 17 | $(SILENT)$(shell rm -f $@) |
18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 18 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
19 | 19 | ||
20 | ifdef SIMVER | 20 | ifdef APP_TYPE |
21 | # wmapro needs libm in the simulator | 21 | # wmapro needs libm in the simulator |
22 | $(CODECDIR)/wmapro.codec: $(CODECDIR)/wmapro.o | 22 | $(CODECDIR)/wmapro.codec: $(CODECDIR)/wmapro.o |
23 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/wmapro.elf \ | 23 | $(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/wmapro.elf \ |
diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index 2f52da4a4e..58a4708819 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make | |||
@@ -21,7 +21,7 @@ OTHER_SRC += $(DOOM_SRC) | |||
21 | 21 | ||
22 | DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing | 22 | DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing |
23 | 23 | ||
24 | ifndef SIMVER | 24 | ifndef APP_TYPE |
25 | ifeq ($(TARGET), IRIVER_H100) | 25 | ifeq ($(TARGET), IRIVER_H100) |
26 | DOOMCCFLAGS += -mstructure-size-boundary=8 | 26 | DOOMCCFLAGS += -mstructure-size-boundary=8 |
27 | endif | 27 | endif |
diff --git a/apps/plugins/goban/goban.make b/apps/plugins/goban/goban.make index 03f2276659..2bc85ad8e1 100644 --- a/apps/plugins/goban/goban.make +++ b/apps/plugins/goban/goban.make | |||
@@ -15,7 +15,7 @@ GOBAN_OBJ := $(call c2obj, $(GOBAN_SRC)) | |||
15 | 15 | ||
16 | OTHER_SRC += $(GOBAN_SRC) | 16 | OTHER_SRC += $(GOBAN_SRC) |
17 | 17 | ||
18 | ifndef SIMVER | 18 | ifndef APP_TYPE |
19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | 19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) |
20 | ### lowmem targets | 20 | ### lowmem targets |
21 | ROCKS += $(GOBAN_BUILDDIR)/goban.ovl | 21 | ROCKS += $(GOBAN_BUILDDIR)/goban.ovl |
diff --git a/apps/plugins/lua/Makefile b/apps/plugins/lua/Makefile index 6a4e497801..09535ac530 100644 --- a/apps/plugins/lua/Makefile +++ b/apps/plugins/lua/Makefile | |||
@@ -27,7 +27,7 @@ OBJS2 := $(SRC:%.c=$(OBJDIR)/%.o) | |||
27 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | 27 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) |
28 | DIRS = . | 28 | DIRS = . |
29 | 29 | ||
30 | ifndef SIMVER | 30 | ifndef APP_TYPE |
31 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | 31 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) |
32 | LDS := archos.lds | 32 | LDS := archos.lds |
33 | OUTPUT = $(OUTDIR)/lua.ovl | 33 | OUTPUT = $(OUTDIR)/lua.ovl |
@@ -41,7 +41,7 @@ endif | |||
41 | 41 | ||
42 | all: $(OUTPUT) | 42 | all: $(OUTPUT) |
43 | 43 | ||
44 | ifndef SIMVER | 44 | ifndef APP_TYPE |
45 | $(OBJDIR)/lua.elf: $(OBJS) $(LINKFILE) | 45 | $(OBJDIR)/lua.elf: $(OBJS) $(LINKFILE) |
46 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ | 46 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \ |
47 | -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/lua.map | 47 | -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/lua.map |
@@ -50,7 +50,7 @@ $(OUTPUT): $(OBJDIR)/lua.elf | |||
50 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ | 50 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
51 | else | 51 | else |
52 | 52 | ||
53 | ifeq ($(SIMVER), sdl) | 53 | ifdef APP_TYPE |
54 | ################################################### | 54 | ################################################### |
55 | # This is the SDL simulator version | 55 | # This is the SDL simulator version |
56 | 56 | ||
diff --git a/apps/plugins/lua/lua.make b/apps/plugins/lua/lua.make index 93139dc8d4..f4dd7710c9 100644 --- a/apps/plugins/lua/lua.make +++ b/apps/plugins/lua/lua.make | |||
@@ -15,7 +15,7 @@ LUA_OBJ := $(call c2obj, $(LUA_SRC)) | |||
15 | 15 | ||
16 | OTHER_SRC += $(LUA_SRC) | 16 | OTHER_SRC += $(LUA_SRC) |
17 | 17 | ||
18 | ifndef SIMVER | 18 | ifndef APP_TYPE |
19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | 19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) |
20 | ### lowmem targets | 20 | ### lowmem targets |
21 | ROCKS += $(LUA_BUILDDIR)/lua.ovl | 21 | ROCKS += $(LUA_BUILDDIR)/lua.ovl |
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make index d39d9fde1e..d2c836f513 100644 --- a/apps/plugins/pdbox/pdbox.make +++ b/apps/plugins/pdbox/pdbox.make | |||
@@ -22,7 +22,7 @@ $(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(MPEG_OBJ) $(CODECDIR)/libtlsf.a | |||
22 | 22 | ||
23 | PDBOXFLAGS = $(PLUGINFLAGS) | 23 | PDBOXFLAGS = $(PLUGINFLAGS) |
24 | PDBOXLDFLAGS = $(PLUGINLDFLAGS) | 24 | PDBOXLDFLAGS = $(PLUGINLDFLAGS) |
25 | ifdef SIMVER | 25 | ifdef APP_TYPE |
26 | PDBOXLDFLAGS += -lm | 26 | PDBOXLDFLAGS += -lm |
27 | endif | 27 | endif |
28 | 28 | ||
@@ -36,7 +36,7 @@ $(PDBOXBUILDDIR)/pdbox.rock: | |||
36 | $(filter %.o, $^) \ | 36 | $(filter %.o, $^) \ |
37 | $(filter %.a, $+) \ | 37 | $(filter %.a, $+) \ |
38 | -lgcc $(PDBOXLDFLAGS) | 38 | -lgcc $(PDBOXLDFLAGS) |
39 | ifdef SIMVER | 39 | ifdef APP_TYPE |
40 | $(SILENT)cp $*.elf $@ | 40 | $(SILENT)cp $*.elf $@ |
41 | else | 41 | else |
42 | $(SILENT)$(OC) -O binary $*.elf $@ | 42 | $(SILENT)$(OC) -O binary $*.elf $@ |
diff --git a/apps/plugins/pictureflow/pictureflow.make b/apps/plugins/pictureflow/pictureflow.make index 28ad2aa39e..e3d4544e07 100644 --- a/apps/plugins/pictureflow/pictureflow.make +++ b/apps/plugins/pictureflow/pictureflow.make | |||
@@ -15,7 +15,7 @@ PICTUREFLOW_OBJ := $(call c2obj, $(PICTUREFLOW_SRC)) | |||
15 | 15 | ||
16 | OTHER_SRC += $(PICTUREFLOW_SRC) | 16 | OTHER_SRC += $(PICTUREFLOW_SRC) |
17 | 17 | ||
18 | ifndef SIMVER | 18 | ifndef APP_TYPE |
19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | 19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) |
20 | ### lowmem targets | 20 | ### lowmem targets |
21 | ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.ovl | 21 | ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.ovl |
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 4bd0cc952e..d3c66c34ca 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -27,7 +27,7 @@ PLUGINLIB_OBJ := $(PLUGINLIB_OBJ:.S=.o) | |||
27 | PLUGINLIB_OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(PLUGINLIB_OBJ)) | 27 | PLUGINLIB_OBJ := $(subst $(ROOTDIR),$(BUILDDIR),$(PLUGINLIB_OBJ)) |
28 | 28 | ||
29 | ### build data / rules | 29 | ### build data / rules |
30 | ifndef SIMVER | 30 | ifndef APP_TYPE |
31 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h | 31 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h |
32 | PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds | 32 | PLUGIN_LDS := $(APPSDIR)/plugins/plugin.lds |
33 | PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link | 33 | PLUGINLINK_LDS := $(BUILDDIR)/apps/plugins/plugin.link |
@@ -81,7 +81,7 @@ $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c | |||
81 | $(SILENT)mkdir -p $(dir $@) | 81 | $(SILENT)mkdir -p $(dir $@) |
82 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ | 82 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ |
83 | 83 | ||
84 | ifdef SIMVER | 84 | ifdef APP_TYPE |
85 | PLUGINLDFLAGS = $(SHARED_FLAG) # <-- from Makefile | 85 | PLUGINLDFLAGS = $(SHARED_FLAG) # <-- from Makefile |
86 | else | 86 | else |
87 | PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map | 87 | PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map |
@@ -94,7 +94,7 @@ $(BUILDDIR)/%.rock: | |||
94 | $(filter %.o, $^) \ | 94 | $(filter %.o, $^) \ |
95 | $(filter %.a, $+) \ | 95 | $(filter %.a, $+) \ |
96 | -lgcc $(PLUGINLDFLAGS) | 96 | -lgcc $(PLUGINLDFLAGS) |
97 | ifdef SIMVER | 97 | ifdef APP_TYPE |
98 | $(SILENT)cp $(BUILDDIR)/$*.elf $@ | 98 | $(SILENT)cp $(BUILDDIR)/$*.elf $@ |
99 | else | 99 | else |
100 | $(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@ | 100 | $(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@ |
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make index de7312e009..a04801aa31 100644 --- a/apps/plugins/zxbox/zxbox.make +++ b/apps/plugins/zxbox/zxbox.make | |||
@@ -15,7 +15,7 @@ ZXBOX_OBJ := $(call c2obj, $(ZXBOX_SRC)) | |||
15 | 15 | ||
16 | OTHER_SRC += $(ZXBOX_SRC) | 16 | OTHER_SRC += $(ZXBOX_SRC) |
17 | 17 | ||
18 | ifndef SIMVER | 18 | ifndef APP_TYPE |
19 | ifeq ($(findstring YES, $(call preprocess, $(APPSDIR)/plugins/BUILD_OVERLAY)), YES) | 19 | ifeq ($(findstring YES, $(call preprocess, $(APPSDIR)/plugins/BUILD_OVERLAY)), YES) |
20 | ## lowmem targets | 20 | ## lowmem targets |
21 | ROCKS += $(ZXBOX_OBJDIR)/zxbox.ovl | 21 | ROCKS += $(ZXBOX_OBJDIR)/zxbox.ovl |
diff --git a/firmware/firmware.make b/firmware/firmware.make index 9d023ab27f..aab735aa91 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make | |||
@@ -8,7 +8,7 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES += -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers -I$(FIRMDIR)/include | 10 | INCLUDES += -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers -I$(FIRMDIR)/include |
11 | ifndef SIMVER | 11 | ifndef APP_TYPE |
12 | INCLUDES += -I$(FIRMDIR)/libc/include | 12 | INCLUDES += -I$(FIRMDIR)/libc/include |
13 | endif | 13 | endif |
14 | 14 | ||
diff --git a/tools/configure b/tools/configure index 504540505d..9f7c63f569 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -103,7 +103,7 @@ simcc () { | |||
103 | prefixtools "$CROSS_COMPILE" | 103 | prefixtools "$CROSS_COMPILE" |
104 | ARG_ARM_THUMB=0 # can't use thumb in native builds | 104 | ARG_ARM_THUMB=0 # can't use thumb in native builds |
105 | 105 | ||
106 | simver=sdl | 106 | app_type=$1 |
107 | winbuild="" | 107 | winbuild="" |
108 | GCCOPTS='-W -Wall -g -fno-builtin' | 108 | GCCOPTS='-W -Wall -g -fno-builtin' |
109 | GCCOPTIMIZE='' | 109 | GCCOPTIMIZE='' |
@@ -171,7 +171,7 @@ simcc () { | |||
171 | [ "$winbuild" != "yes" ] && GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" | 171 | [ "$winbuild" != "yes" ] && GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" |
172 | sdl=`findsdl $winbuild` | 172 | sdl=`findsdl $winbuild` |
173 | 173 | ||
174 | if [ $1 = "sdl" ]; then | 174 | if [ -n `echo $app_type | grep "sdl"` ]; then |
175 | if [ -z "$sdl" ]; then | 175 | if [ -z "$sdl" ]; then |
176 | echo "configure didn't find sdl-config, which indicates that you" | 176 | echo "configure didn't find sdl-config, which indicates that you" |
177 | echo "don't have SDL (properly) installed. Please correct and" | 177 | echo "don't have SDL (properly) installed. Please correct and" |
@@ -233,9 +233,11 @@ EOF | |||
233 | echo "WARNING: Cross Compiling, cannot detect endianess. Assuming little endian!" | 233 | echo "WARNING: Cross Compiling, cannot detect endianess. Assuming little endian!" |
234 | fi | 234 | fi |
235 | 235 | ||
236 | if [ $1 = "sdl" ]; then | 236 | if [ "$app_type" = "sdl-sim" ]; then |
237 | echo "Simulator environment deemed $endian endian" | 237 | echo "Simulator environment deemed $endian endian" |
238 | elif [ $1 = "checkwps" ]; then | 238 | elif [ "$app_type" = "sdl-app" ]; then |
239 | echo "Application environment deemed $endian endian" | ||
240 | elif [ "$app_type" = "checkwps" ]; then | ||
239 | echo "CheckWPS environment deemed $endian endian" | 241 | echo "CheckWPS environment deemed $endian endian" |
240 | fi | 242 | fi |
241 | 243 | ||
@@ -2604,7 +2606,7 @@ fi | |||
2604 | target="-DAPPLICATION" | 2606 | target="-DAPPLICATION" |
2605 | memory=32 | 2607 | memory=32 |
2606 | uname=`uname` | 2608 | uname=`uname` |
2607 | simcc "sdl" | 2609 | simcc "sdl-app" |
2608 | tool="cp " | 2610 | tool="cp " |
2609 | boottool="cp " | 2611 | boottool="cp " |
2610 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 2612 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -2855,7 +2857,7 @@ uname=`uname` | |||
2855 | 2857 | ||
2856 | if [ "yes" = "$simulator" ]; then | 2858 | if [ "yes" = "$simulator" ]; then |
2857 | # setup compiler and things for simulator | 2859 | # setup compiler and things for simulator |
2858 | simcc "sdl" | 2860 | simcc "sdl-sim" |
2859 | 2861 | ||
2860 | if [ -d "simdisk" ]; then | 2862 | if [ -d "simdisk" ]; then |
2861 | echo "Subdirectory 'simdisk' already present" | 2863 | echo "Subdirectory 'simdisk' already present" |
@@ -3136,7 +3138,7 @@ sed > Makefile \ | |||
3136 | -e "s<@FIRMDIR@<${firmdir}<g" \ | 3138 | -e "s<@FIRMDIR@<${firmdir}<g" \ |
3137 | -e "s<@TOOLSDIR@<${toolsdir}<g" \ | 3139 | -e "s<@TOOLSDIR@<${toolsdir}<g" \ |
3138 | -e "s<@APPS@<${apps}<g" \ | 3140 | -e "s<@APPS@<${apps}<g" \ |
3139 | -e "s<@SIMVER@<${simver}<g" \ | 3141 | -e "s<@APP_TYPE@<${app_type}<g" \ |
3140 | -e "s<@GCCVER@<${gccver}<g" \ | 3142 | -e "s<@GCCVER@<${gccver}<g" \ |
3141 | -e "s<@GCCNUM@<${gccnum}<g" \ | 3143 | -e "s<@GCCNUM@<${gccnum}<g" \ |
3142 | -e "s<@UNAME@<${uname}<g" \ | 3144 | -e "s<@UNAME@<${uname}<g" \ |
@@ -3202,7 +3204,7 @@ export DLLWRAP=@DLLWRAP@ | |||
3202 | export RANLIB=@RANLIB@ | 3204 | export RANLIB=@RANLIB@ |
3203 | export PREFIX=@PREFIX@ | 3205 | export PREFIX=@PREFIX@ |
3204 | export PROFILE_OPTS=@PROFILE_OPTS@ | 3206 | export PROFILE_OPTS=@PROFILE_OPTS@ |
3205 | export SIMVER=@SIMVER@ | 3207 | export APP_TYPE=@APP_TYPE@ |
3206 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl | 3208 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl |
3207 | export GCCOPTS=@GCCOPTS@ | 3209 | export GCCOPTS=@GCCOPTS@ |
3208 | export TARGET_INC=@TARGET_INC@ | 3210 | export TARGET_INC=@TARGET_INC@ |
diff --git a/tools/database/Makefile b/tools/database/Makefile index 5828b20c09..09b58b5954 100644 --- a/tools/database/Makefile +++ b/tools/database/Makefile | |||
@@ -1,43 +1,69 @@ | |||
1 | ifndef V | 1 | ## Automatically generated. http://www.rockbox.org/ |
2 | SILENT = @ | ||
3 | endif | ||
4 | INCLUDE = -I../../firmware/export \ | ||
5 | -I../../apps -I../../apps/gui -I../../uisimulator/sdl -I/usr/include/SDL | ||
6 | FIRMINC = -I../../firmware/include -fno-builtin | ||
7 | DEFINES = -D__PCTOOL__ -DHAVE_TAGCACHE -DSIMULATOR -DCONFIG_CODEC=1 \ | ||
8 | -DROCKBOX_LITTLE_ENDIAN -DROCKBOX_DIR=\".rockbox\" -DROCKBOX_HAS_LOGF \ | ||
9 | -DCONFIG_CODEC=1 | ||
10 | CFLAGS = -g $(INCLUDE) $(DEFINES) -Wno-pointer-sign | ||
11 | 2 | ||
12 | SRC = database.c tagcache.c replaygain.c \ | 3 | export ROOTDIR=/home/kugel/rbdev/rockbox-git |
13 | metadata.c metadata_common.c mp3data.c \ | 4 | export FIRMDIR=$(ROOTDIR)/firmware |
14 | a52.c mp3.c adx.c mp4.c aiff.c mpc.c ape.c ogg.c \ | 5 | export APPSDIR=$(ROOTDIR)/tools/database |
15 | asap.c sid.c asf.c spc.c flac.c vorbis.c wave.c \ | 6 | export TOOLSDIR=$(ROOTDIR)/tools |
16 | mod.c wavpack.c monkeys.c rm.c nsf.c smaf.c \ | 7 | export DOCSDIR=$(ROOTDIR)/docs |
17 | logf.c unicode.c ctype.c structec.c crc32.c io.c \ | 8 | export MANUALDIR=${ROOTDIR}/manual |
18 | misc.c strlcpy.c fixedpoint.c | 9 | export DEBUG= |
10 | export MODELNAME=iriverh300 | ||
11 | export ARCHOSROM= | ||
12 | export FLASHFILE= | ||
13 | export TARGET_ID=10 | ||
14 | export TARGET=-DIRIVER_H300 | ||
15 | export CPU= | ||
16 | export MANUFACTURER=iriver | ||
17 | export OBJDIR=/home/kugel/rbdev/rockbox-git/tools/database | ||
18 | export BUILDDIR=/home/kugel/rbdev/rockbox-git/tools/database | ||
19 | export LANGUAGE=english | ||
20 | export VOICELANGUAGE= | ||
21 | export MEMORYSIZE=32 | ||
22 | export BUILDDATE:=$(shell date -u +'-DYEAR=%Y -DMONTH=%m -DDAY=%d') | ||
23 | export MKFIRMWARE=/home/kugel/rbdev/rockbox-git/tools/scramble -add=h300 | ||
24 | export BMP2RB_MONO=/home/kugel/rbdev/rockbox-git/tools/bmp2rb -f 0 | ||
25 | export BMP2RB_NATIVE=/home/kugel/rbdev/rockbox-git/tools/bmp2rb -f 4 | ||
26 | export BMP2RB_REMOTEMONO=/home/kugel/rbdev/rockbox-git/tools/bmp2rb -f 0 | ||
27 | export BMP2RB_REMOTENATIVE=/home/kugel/rbdev/rockbox-git/tools/bmp2rb -f 0 | ||
28 | export BINARY=database.iriverh300 | ||
29 | export APPEXTRA=recorder:gui:radio | ||
30 | export ENABLEDPLUGINS=yes | ||
31 | export SOFTWARECODECS=yes | ||
32 | export EXTRA_DEFINES= | ||
33 | export HOSTCC=/usr/bin/gcc | ||
34 | export HOSTAR=/usr/bin/ar | ||
35 | export CC=/usr/bin/ccache /usr/bin/gcc | ||
36 | export LD=/usr/bin/ar | ||
37 | export AR=/usr/bin/ar | ||
38 | export AS=/usr/bin/as | ||
39 | export OC=/usr/bin/objcopy | ||
40 | export WINDRES=windres | ||
41 | export DLLTOOL=dlltool | ||
42 | export DLLWRAP=dllwrap | ||
43 | export RANLIB=/usr/bin/ranlib | ||
44 | export PREFIX= | ||
45 | export PROFILE_OPTS= | ||
46 | export APP_TYPE=database | ||
47 | export SIMDIR=$(ROOTDIR)/uisimulator/sdl | ||
48 | export GCCOPTS= -Wno-pointer-sign -Wno-override-init | ||
49 | export TARGET_INC= | ||
50 | export LOADADDRESS= | ||
51 | export SHARED_FLAG=-shared | ||
52 | export LDOPTS=-lm -ldl -L/home/kugel/.sdl/lib -Wl,-rpath,/home/kugel/.sdl/lib -lSDL -lpthread | ||
53 | export GLOBAL_LDOPTS= -Wl,-z,defs | ||
54 | export GCCVER=4.4.3 | ||
55 | export GCCNUM=404 | ||
56 | export UNAME=Linux | ||
57 | export MANUALDEV=iriverh300 | ||
58 | export TTS_OPTS= | ||
59 | export TTS_ENGINE= | ||
60 | export ENC_OPTS= | ||
61 | export ENCODER= | ||
62 | export USE_ELF= | ||
63 | export RBDIR=.rockbox | ||
64 | export SDLCONFIG=/home/kugel/.sdl/bin/sdl-config | ||
19 | 65 | ||
20 | OBJ = $(SRC:.c=.o) | 66 | CONFIGURE_OPTIONS=--target=$(MODELNAME) --ram=$(MEMORYSIZE) --rbdir=$(RBDIR) --type=d --prefix=$(PREFIX) |
21 | 67 | ||
22 | # source code search path | 68 | include $(TOOLSDIR)/root.make |
23 | VPATH = ../../apps ../../apps/metadata ../../firmware/common ../../firmware/ \ | ||
24 | ../../uisimulator/common | ||
25 | 69 | ||
26 | TARGET= database | ||
27 | |||
28 | all: $(TARGET) | ||
29 | |||
30 | %.o : ../../uisimulator/common/%.c | ||
31 | @echo CC $(<F) | ||
32 | $(SILENT)$(CC) $(CFLAGS) -c -o $@ $< | ||
33 | |||
34 | %.o : %.c $< | ||
35 | @echo CC $(<F) | ||
36 | $(SILENT)$(CC) $(FIRMINC) $(CFLAGS) -c -o $@ $< | ||
37 | |||
38 | database: $(OBJ) | ||
39 | @echo LD $@ | ||
40 | $(SILENT)$(CC) -g -ldl -o $@ $+ | ||
41 | |||
42 | clean: | ||
43 | rm -f $(OBJ) $(TARGET) | ||
diff --git a/tools/root.make b/tools/root.make index 2b4dfb6bb2..e53c452022 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -24,7 +24,7 @@ TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ | |||
24 | 24 | ||
25 | 25 | ||
26 | ifeq (,$(PREFIX)) | 26 | ifeq (,$(PREFIX)) |
27 | ifdef SIMVER | 27 | ifeq ($(APP_TYPE),sdl-sim) |
28 | # for sims, set simdisk/ as default | 28 | # for sims, set simdisk/ as default |
29 | PREFIX = simdisk | 29 | PREFIX = simdisk |
30 | INSTALL = --install="$(PREFIX)" | 30 | INSTALL = --install="$(PREFIX)" |
@@ -85,7 +85,7 @@ else | |||
85 | include $(APPSDIR)/plugins/plugins.make | 85 | include $(APPSDIR)/plugins/plugins.make |
86 | endif | 86 | endif |
87 | 87 | ||
88 | ifdef SIMVER | 88 | ifdef APP_TYPE |
89 | include $(ROOTDIR)/uisimulator/uisimulator.make | 89 | include $(ROOTDIR)/uisimulator/uisimulator.make |
90 | endif | 90 | endif |
91 | endif # bootloader | 91 | endif # bootloader |
@@ -141,7 +141,7 @@ ifeq (,$(findstring bootloader,$(APPSDIR))) | |||
141 | 141 | ||
142 | OBJ += $(LANG_O) | 142 | OBJ += $(LANG_O) |
143 | 143 | ||
144 | ifndef SIMVER | 144 | ifndef APP_TYPE |
145 | 145 | ||
146 | ## target build | 146 | ## target build |
147 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h | 147 | CONFIGFILE := $(FIRMDIR)/export/config/$(MODELNAME).h |
@@ -221,7 +221,7 @@ $(MAXOUTFILE): | |||
221 | $(BUILDDIR)/rombox.iriver: $(BUILDDIR)/rombox.bin | 221 | $(BUILDDIR)/rombox.iriver: $(BUILDDIR)/rombox.bin |
222 | $(call PRINTS,Build ROM file)$(MKFIRMWARE) $< $@ | 222 | $(call PRINTS,Build ROM file)$(MKFIRMWARE) $< $@ |
223 | 223 | ||
224 | endif # !SIMVER | 224 | endif # !APP_TYPE |
225 | endif # !bootloader | 225 | endif # !bootloader |
226 | 226 | ||
227 | 227 | ||
diff --git a/uisimulator/common/Makefile b/uisimulator/common/Makefile index f54df57b27..c892f1c615 100644 --- a/uisimulator/common/Makefile +++ b/uisimulator/common/Makefile | |||
@@ -24,7 +24,7 @@ DEBUG = -g | |||
24 | 24 | ||
25 | # Use this for simulator-only files | 25 | # Use this for simulator-only files |
26 | INCLUDES = -I. -I$(OBJDIR) $(TARGET_INC) -I$(FIRMDIR)/export -I$(APPSDIR) \ | 26 | INCLUDES = -I. -I$(OBJDIR) $(TARGET_INC) -I$(FIRMDIR)/export -I$(APPSDIR) \ |
27 | -I$(ROOTDIR)/uisimulator/$(SIMVER) -I$(BUILDDIR) | 27 | -I$(ROOTDIR)/uisimulator/sdl -I$(BUILDDIR) |
28 | 28 | ||
29 | # This sets up 'SRC' based on the files mentioned in SOURCES | 29 | # This sets up 'SRC' based on the files mentioned in SOURCES |
30 | include $(TOOLSDIR)/makesrc.inc | 30 | include $(TOOLSDIR)/makesrc.inc |