diff options
author | Yoshihisa Uchida <uchida@rockbox.org> | 2010-02-25 12:28:30 +0000 |
---|---|---|
committer | Yoshihisa Uchida <uchida@rockbox.org> | 2010-02-25 12:28:30 +0000 |
commit | ec39c055198cc4536e8131f142df1f0a9661982c (patch) | |
tree | 7e0d0720189c5d7b13c00cbb51eb5407368cc01d | |
parent | 0cf4cab4319c5cfe3960b73ae835f5f4e5e7f525 (diff) | |
download | rockbox-ec39c055198cc4536e8131f142df1f0a9661982c.tar.gz rockbox-ec39c055198cc4536e8131f142df1f0a9661982c.zip |
tools/database: build process updates.
- buildable for Cygwin/MinGW.
- SDL cobfig is set by using SDL-config.
- metadata/*.c add automaticaly when database tool builds.
- bitmap files do not create when database tool builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24908 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--[-rwxr-xr-x] | tools/configure | 13 | ||||
-rw-r--r-- | tools/database/SOURCES | 29 | ||||
-rw-r--r-- | tools/database/database.make | 29 | ||||
-rw-r--r-- | tools/root.make | 6 |
4 files changed, 44 insertions, 33 deletions
diff --git a/tools/configure b/tools/configure index dbef1e8167..5b007e9aa4 100755..100644 --- a/tools/configure +++ b/tools/configure | |||
@@ -2672,8 +2672,17 @@ fi | |||
2672 | t_cpu=''; | 2672 | t_cpu=''; |
2673 | GCCOPTS=''; | 2673 | GCCOPTS=''; |
2674 | appsdir='\$(ROOTDIR)/tools/database'; | 2674 | appsdir='\$(ROOTDIR)/tools/database'; |
2675 | output='database.'${modelname}; | ||
2676 | archosrom=''; | 2675 | archosrom=''; |
2676 | |||
2677 | case $uname in | ||
2678 | CYGWIN*|MINGW*) | ||
2679 | output="database_${modelname}.exe" | ||
2680 | ;; | ||
2681 | *) | ||
2682 | output='database.'${modelname}; | ||
2683 | ;; | ||
2684 | esac | ||
2685 | |||
2677 | echo "Database tool build selected" | 2686 | echo "Database tool build selected" |
2678 | ;; | 2687 | ;; |
2679 | *) | 2688 | *) |
@@ -3007,6 +3016,7 @@ sed > Makefile \ | |||
3007 | -e "s,@RBDIR@,${rbdir},g" \ | 3016 | -e "s,@RBDIR@,${rbdir},g" \ |
3008 | -e "s,@PREFIX@,$PREFIX,g" \ | 3017 | -e "s,@PREFIX@,$PREFIX,g" \ |
3009 | -e "s,@CMDLINE@,$cmdline,g" \ | 3018 | -e "s,@CMDLINE@,$cmdline,g" \ |
3019 | -e "s,@SDLCONFIG@,$sdl,g" \ | ||
3010 | <<EOF | 3020 | <<EOF |
3011 | ## Automatically generated. http://www.rockbox.org/ | 3021 | ## Automatically generated. http://www.rockbox.org/ |
3012 | 3022 | ||
@@ -3071,6 +3081,7 @@ export ENC_OPTS=@ENC_OPTS@ | |||
3071 | export ENCODER=@ENCODER@ | 3081 | export ENCODER=@ENCODER@ |
3072 | export USE_ELF=@USE_ELF@ | 3082 | export USE_ELF=@USE_ELF@ |
3073 | export RBDIR=@RBDIR@ | 3083 | export RBDIR=@RBDIR@ |
3084 | export SDLCONFIG=@SDLCONFIG@ | ||
3074 | 3085 | ||
3075 | CONFIGURE_OPTIONS=@CMDLINE@ | 3086 | CONFIGURE_OPTIONS=@CMDLINE@ |
3076 | 3087 | ||
diff --git a/tools/database/SOURCES b/tools/database/SOURCES index 0300040efa..56bb9f1323 100644 --- a/tools/database/SOURCES +++ b/tools/database/SOURCES | |||
@@ -1,30 +1,7 @@ | |||
1 | database.c | 1 | database.c |
2 | ../../apps/fixedpoint.c | 2 | ../../apps/fixedpoint.c |
3 | ../../apps/metadata.c | 3 | ../../apps/metadata.c |
4 | ../../apps/metadata/mp3.c | ||
5 | #if CONFIG_CODEC == SWCODEC | 4 | #if CONFIG_CODEC == SWCODEC |
6 | ../../apps/metadata/metadata_common.c | ||
7 | ../../apps/metadata/aiff.c | ||
8 | ../../apps/metadata/ape.c | ||
9 | ../../apps/metadata/asf.c | ||
10 | ../../apps/metadata/adx.c | ||
11 | ../../apps/metadata/flac.c | ||
12 | ../../apps/metadata/monkeys.c | ||
13 | ../../apps/metadata/mp4.c | ||
14 | ../../apps/metadata/mpc.c | ||
15 | ../../apps/metadata/ogg.c | ||
16 | ../../apps/metadata/sid.c | ||
17 | ../../apps/metadata/mod.c | ||
18 | ../../apps/metadata/spc.c | ||
19 | ../../apps/metadata/vorbis.c | ||
20 | ../../apps/metadata/wave.c | ||
21 | ../../apps/metadata/wavpack.c | ||
22 | ../../apps/metadata/a52.c | ||
23 | ../../apps/metadata/asap.c | ||
24 | ../../apps/metadata/rm.c | ||
25 | ../../apps/metadata/nsf.c | ||
26 | ../../apps/metadata/oma.c | ||
27 | ../../apps/metadata/smaf.c | ||
28 | ../../apps/replaygain.c | 5 | ../../apps/replaygain.c |
29 | #endif | 6 | #endif |
30 | ../../apps/misc.c | 7 | ../../apps/misc.c |
@@ -32,8 +9,14 @@ database.c | |||
32 | ../../apps/tagcache.c | 9 | ../../apps/tagcache.c |
33 | ../../firmware/common/crc32.c | 10 | ../../firmware/common/crc32.c |
34 | ../../firmware/common/ctype.c | 11 | ../../firmware/common/ctype.c |
12 | ../../firmware/common/errno.c | ||
35 | ../../firmware/common/strlcpy.c | 13 | ../../firmware/common/strlcpy.c |
14 | ../../firmware/common/strcasestr.c | ||
36 | ../../firmware/common/structec.c | 15 | ../../firmware/common/structec.c |
37 | ../../firmware/common/unicode.c | 16 | ../../firmware/common/unicode.c |
38 | ../../firmware/logf.c | 17 | ../../firmware/logf.c |
39 | ../../uisimulator/common/io.c | 18 | ../../uisimulator/common/io.c |
19 | #if CONFIG_CODEC != SWCODEC | ||
20 | ../../apps/metadata/mp3.c | ||
21 | #endif | ||
22 | /* Caution. metadata files do not add!! */ | ||
diff --git a/tools/database/database.make b/tools/database/database.make index a94aa55c78..62b2e9f24c 100644 --- a/tools/database/database.make +++ b/tools/database/database.make | |||
@@ -7,12 +7,21 @@ | |||
7 | # $Id: checkwps.make 22680 2009-09-11 17:58:17Z gevaerts $ | 7 | # $Id: checkwps.make 22680 2009-09-11 17:58:17Z gevaerts $ |
8 | # | 8 | # |
9 | 9 | ||
10 | FIRMINC = -I../../firmware/include -fno-builtin | ||
11 | |||
12 | DBDEFINES=-g -DDEBUG -D__PCTOOL__ -DSIMULATOR | 10 | DBDEFINES=-g -DDEBUG -D__PCTOOL__ -DSIMULATOR |
13 | CFLAGS+=$(DBDEFINES) | 11 | CFLAGS+=$(DBDEFINES) |
14 | 12 | ||
15 | SRC= $(call preprocess, $(TOOLSDIR)/database/SOURCES) | 13 | createsrc = $(shell cat $(1) > $(3); echo "\#if CONFIG_CODEC == SWCODEC" >> $(3); \ |
14 | echo $(2) | sed 's/ /\n/g' >> $(3); \ | ||
15 | echo "\#endif" >> $(3); \ | ||
16 | echo $(3)) | ||
17 | |||
18 | METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/apps/metadata/*.c)) | ||
19 | |||
20 | SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ | ||
21 | $(METADATAS), \ | ||
22 | $(TOOLSDIR)/database/SOURCES.build) | ||
23 | |||
24 | SRC= $(call preprocess, $(SRCFILE)) | ||
16 | 25 | ||
17 | FIRMINC = -I$(ROOTDIR)/firmware/include -fno-builtin | 26 | FIRMINC = -I$(ROOTDIR)/firmware/include -fno-builtin |
18 | 27 | ||
@@ -24,19 +33,25 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \ | |||
24 | -I$(BUILDDIR) \ | 33 | -I$(BUILDDIR) \ |
25 | 34 | ||
26 | SIMINCLUDES += -I$(ROOTDIR)/uisimulator/sdl -I$(ROOTDIR)/uisimulator/common \ | 35 | SIMINCLUDES += -I$(ROOTDIR)/uisimulator/sdl -I$(ROOTDIR)/uisimulator/common \ |
27 | -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR) -I/usr/include/SDL | 36 | -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR) |
28 | 37 | ||
29 | # Makes mkdepfile happy | 38 | # Makes mkdepfile happy |
39 | GCCOPTS+=`$(SDLCONFIG) --cflags` | ||
30 | OLDGCCOPTS:=$(GCCOPTS) | 40 | OLDGCCOPTS:=$(GCCOPTS) |
31 | GCCOPTS+=-D__PCTOOL__ $(FIRMINC) $(SIMINCLUDES) | 41 | GCCOPTS+=-D__PCTOOL__ $(FIRMINC) $(SIMINCLUDES) |
32 | 42 | ||
43 | LIBS=`$(SDLCONFIG) --libs` | ||
44 | ifneq ($(findstring MINGW,$(shell uname)),MINGW) | ||
45 | LIBS += -ldl | ||
46 | endif | ||
47 | |||
33 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this | 48 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this |
34 | 49 | ||
50 | SIMFLAGS += $(SIMINCLUDES) $(DBDEFINES) -DHAVE_CONFIG_H $(OLDGCCOPTS) $(INCLUDES) | ||
51 | |||
35 | $(BUILDDIR)/$(BINARY): $$(OBJ) | 52 | $(BUILDDIR)/$(BINARY): $$(OBJ) |
36 | @echo LD $(BINARY) | 53 | @echo LD $(BINARY) |
37 | $(SILENT)$(HOSTCC) $(INCLUDE) $(FLAGS) -ldl -o $@ $+ | 54 | $(SILENT)$(HOSTCC) $(SIMFLAGS) $(LIBS) -o $@ $+ |
38 | |||
39 | SIMFLAGS += $(SIMINCLUDES) $(DBDEFINES) -DHAVE_CONFIG_H $(OLDGCCOPTS) $(INCLUDES) | ||
40 | 55 | ||
41 | $(BUILDDIR)/tools/database/../../uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c | 56 | $(BUILDDIR)/tools/database/../../uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c |
42 | $(SILENT)mkdir -p $(dir $@) | 57 | $(SILENT)mkdir -p $(dir $@) |
diff --git a/tools/root.make b/tools/root.make index 76d493b22e..4bf1a32728 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -57,8 +57,10 @@ all: $(DEPFILE) build | |||
57 | include $(TOOLSDIR)/tools.make | 57 | include $(TOOLSDIR)/tools.make |
58 | 58 | ||
59 | ifeq (,$(findstring checkwps,$(APPSDIR))) | 59 | ifeq (,$(findstring checkwps,$(APPSDIR))) |
60 | include $(FIRMDIR)/firmware.make | 60 | ifeq (,$(findstring database,$(APPSDIR))) |
61 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make | 61 | include $(FIRMDIR)/firmware.make |
62 | include $(ROOTDIR)/apps/bitmaps/bitmaps.make | ||
63 | endif | ||
62 | endif | 64 | endif |
63 | 65 | ||
64 | ifneq (,$(findstring bootloader,$(APPSDIR))) | 66 | ifneq (,$(findstring bootloader,$(APPSDIR))) |