diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-07-31 10:33:27 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-07-31 10:33:27 +0200 |
| commit | efe73e143ad8997a791b895c9ee21a68b6570429 (patch) | |
| tree | d206dd97632286975a271ea1502f35b56165767f /tools/database/database.make | |
| parent | b358bcfc25272cb03dc95809c0c82688943f0f84 (diff) | |
| download | rockbox-efe73e143ad8997a791b895c9ee21a68b6570429.zip rockbox-efe73e143ad8997a791b895c9ee21a68b6570429.tar.gz rockbox-efe73e143ad8997a791b895c9ee21a68b6570429.tar.bz2 rockbox-efe73e143ad8997a791b895c9ee21a68b6570429.tar.xz | |
Fix database tool.
It was also broken functionally, probably since a while.So restore the
functionality. Run it on the dap, the tcd files will be placed into .rockbox folder.
Change-Id: Id7a6ce4389dfaf99799258902be80d630af0601c
Diffstat (limited to 'tools/database/database.make')
| -rw-r--r-- | tools/database/database.make | 54 |
1 files changed, 17 insertions, 37 deletions
diff --git a/tools/database/database.make b/tools/database/database.make index 49ad2ff..89a4aa7 100644 --- a/tools/database/database.make +++ b/tools/database/database.make @@ -7,8 +7,7 @@ # $Id: checkwps.make 22680 2009-09-11 17:58:17Z gevaerts $ # -DBDEFINES=-g -DDEBUG -D__PCTOOL__ -CFLAGS+=$(DBDEFINES) +GCCOPTS += -g -DDEBUG -D__PCTOOL__ -DDBTOOL createsrc = $(shell cat $(1) > $(3); echo "\#if CONFIG_CODEC == SWCODEC" >> $(3); \ echo $(2) | sed 's/ /\n/g' >> $(3); \ @@ -21,44 +20,25 @@ SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ $(METADATAS), \ $(TOOLSDIR)/database/SOURCES.build) -SRC= $(call preprocess, $(SRCFILE)) +DATABASE_SRC = $(call preprocess, $(SRCFILE)) +DATABASE_OBJ = $(call c2obj,$(DATABASE_SRC)) -INCLUDES = -I$(ROOTDIR)/apps/gui \ - -I$(ROOTDIR)/firmware/export \ - -I$(ROOTDIR)/firmware/include \ - -I$(ROOTDIR)/apps \ - -I$(ROOTDIR)/apps/recorder \ - -I$(ROOTDIR)/lib/rbcodec \ - -I$(ROOTDIR)/lib/rbcodec/metadata \ - -I$(ROOTDIR)/lib/rbcodec/dsp \ - -I$(APPSDIR) \ - -I$(BUILDDIR) \ +OTHER_SRC += $(DATABASE_SRC) -SIMINCLUDES += -I$(FIRMDIR)/target/hosted/sdl -I$(FIRMDIR)/target/hosted \ - -I$(ROOTDIR)/uisimulator/common -I$(FIRMDIR)/export -I$(BUILDDIR) -I$(APPSDIR) +INCLUDES += -I$(ROOTDIR)/apps/gui \ + -I$(ROOTDIR)/firmware/export \ + -I$(ROOTDIR)/firmware/include \ + -I$(ROOTDIR)/apps \ + -I$(ROOTDIR)/apps/recorder \ + -I$(ROOTDIR)/lib/rbcodec \ + -I$(ROOTDIR)/lib/rbcodec/metadata \ + -I$(ROOTDIR)/lib/rbcodec/dsp \ + -I$(APPSDIR) \ + -I$(BUILDDIR) -# Makes mkdepfile happy -GCCOPTS+=`$(SDLCONFIG) --cflags` -OLDGCCOPTS:=$(GCCOPTS) -GCCOPTS+=-D__PCTOOL__ -fno-builtin $(INCLUDES) $(SIMINCLUDES) - -LIBS=`$(SDLCONFIG) --libs` -lc -ifneq ($(findstring MINGW,$(shell uname)),MINGW) -LIBS += -ldl -endif .SECONDEXPANSION: # $$(OBJ) is not populated until after this -SIMFLAGS += $(SIMINCLUDES) $(DBDEFINES) -DHAVE_CONFIG_H $(OLDGCCOPTS) $(INCLUDES) - -$(BUILDDIR)/$(BINARY): $$(OBJ) - @echo LD $(BINARY) - $(SILENT)$(HOSTCC) $(SIMFLAGS) $(LIBS) -o $@ $+ - -$(BUILDDIR)/tools/database/../../uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c - $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SIMFLAGS) -c $< -o $@ - -$(BUILDDIR)/tools/database/database.o: $(APPSDIR)/database.c - $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SIMFLAGS) -c $< -o $@ +$(BUILDDIR)/$(BINARY): $$(DATABASE_OBJ) + $(call PRINTS,LD $(BINARY)) + $(SILENT)$(HOSTCC) -o $@ $+ |