diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 23:16:48 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 23:16:48 +0200 |
| commit | 54e00c18a3520cda1c5c459ed9e0c1eae2eb4490 (patch) | |
| tree | 5c2188e3e190648555c28e2d002f4f7a21e90090 | |
| parent | f269aa0060950f7b9c42216267c639a2fb556196 (diff) | |
| download | rockbox-54e00c18a3520cda1c5c459ed9e0c1eae2eb4490.zip rockbox-54e00c18a3520cda1c5c459ed9e0c1eae2eb4490.tar.gz rockbox-54e00c18a3520cda1c5c459ed9e0c1eae2eb4490.tar.bz2 rockbox-54e00c18a3520cda1c5c459ed9e0c1eae2eb4490.tar.xz | |
Fix sim/checkwps build failure.
Change-Id: Iefd533fe26495a29f8e79113b38748b504d94213
| -rw-r--r-- | tools/checkwps/checkwps.make | 15 | ||||
| -rw-r--r-- | tools/root.make | 1 | ||||
| -rw-r--r-- | uisimulator/uisimulator.make | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/tools/checkwps/checkwps.make b/tools/checkwps/checkwps.make index 36a9bb4..646b59e 100644 --- a/tools/checkwps/checkwps.make +++ b/tools/checkwps/checkwps.make @@ -7,9 +7,12 @@ # $Id$ # -FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall +GCCOPTS=-g -D__PCTOOL__ -DCHECKWPS $(TARGET) -SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) +CHECKWPS_SRC = $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) +CHECKWPS_OBJ = $(call c2obj,$(CHECKWPS_SRC)) + +OTHER_SRC += $(CHECKWPS_SRC) INCLUDES = -I$(ROOTDIR)/apps/gui \ -I$(ROOTDIR)/apps/gui/skin_engine \ @@ -24,11 +27,11 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \ -I$(APPSDIR) \ -I$(BUILDDIR) -# Makes mkdepfile happy -GCCOPTS+=-D__PCTOOL__ -DCHECKWPS -g +include $(ROOTDIR)/lib/skin_parser/skin_parser.make .SECONDEXPANSION: # $$(OBJ) is not populated until after this -$(BUILDDIR)/$(BINARY): $$(OBJ) $$(SKINLIB) +$(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $(CORE_LIBS) @echo LD $(BINARY) - $(SILENT)$(HOSTCC) $(INCLUDE) $(FLAGS) -L$(BUILDDIR)/lib -lskin_parser -o $@ $+ + $(SILENT)$(HOSTCC) -o $@ $+ $(INCLUDE) $(GCCOPTS) \ + -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) diff --git a/tools/root.make b/tools/root.make index eb7e748..861f017 100644 --- a/tools/root.make +++ b/tools/root.make @@ -90,7 +90,6 @@ else ifneq (,$(findstring bootbox,$(APPSDIR))) include $(APPSDIR)/bootbox.make else ifneq (,$(findstring checkwps,$(APP_TYPE))) include $(APPSDIR)/checkwps.make - include $(ROOTDIR)/lib/skin_parser/skin_parser.make else ifneq (,$(findstring database,$(APP_TYPE))) include $(APPSDIR)/database.make else ifneq (,$(findstring warble,$(APP_TYPE))) diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make index 77cd514..1ab3fda 100644 --- a/uisimulator/uisimulator.make +++ b/uisimulator/uisimulator.make @@ -30,7 +30,7 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP) $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null -$(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $(SIMLIB) +$(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $(SIMLIB) $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) \ -Wl,-Map,$(BUILDDIR)/rockbox.map |