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.tar.gz rockbox-54e00c18a3520cda1c5c459ed9e0c1eae2eb4490.zip |
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 36a9bb4a30..646b59ef5d 100644 --- a/tools/checkwps/checkwps.make +++ b/tools/checkwps/checkwps.make | |||
@@ -7,9 +7,12 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall | 10 | GCCOPTS=-g -D__PCTOOL__ -DCHECKWPS $(TARGET) |
11 | 11 | ||
12 | SRC= $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) | 12 | CHECKWPS_SRC = $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) |
13 | CHECKWPS_OBJ = $(call c2obj,$(CHECKWPS_SRC)) | ||
14 | |||
15 | OTHER_SRC += $(CHECKWPS_SRC) | ||
13 | 16 | ||
14 | INCLUDES = -I$(ROOTDIR)/apps/gui \ | 17 | INCLUDES = -I$(ROOTDIR)/apps/gui \ |
15 | -I$(ROOTDIR)/apps/gui/skin_engine \ | 18 | -I$(ROOTDIR)/apps/gui/skin_engine \ |
@@ -24,11 +27,11 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \ | |||
24 | -I$(APPSDIR) \ | 27 | -I$(APPSDIR) \ |
25 | -I$(BUILDDIR) | 28 | -I$(BUILDDIR) |
26 | 29 | ||
27 | # Makes mkdepfile happy | 30 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make |
28 | GCCOPTS+=-D__PCTOOL__ -DCHECKWPS -g | ||
29 | 31 | ||
30 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this | 32 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this |
31 | 33 | ||
32 | $(BUILDDIR)/$(BINARY): $$(OBJ) $$(SKINLIB) | 34 | $(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $(CORE_LIBS) |
33 | @echo LD $(BINARY) | 35 | @echo LD $(BINARY) |
34 | $(SILENT)$(HOSTCC) $(INCLUDE) $(FLAGS) -L$(BUILDDIR)/lib -lskin_parser -o $@ $+ | 36 | $(SILENT)$(HOSTCC) -o $@ $+ $(INCLUDE) $(GCCOPTS) \ |
37 | -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) | ||
diff --git a/tools/root.make b/tools/root.make index eb7e7480d3..861f017a82 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -90,7 +90,6 @@ else ifneq (,$(findstring bootbox,$(APPSDIR))) | |||
90 | include $(APPSDIR)/bootbox.make | 90 | include $(APPSDIR)/bootbox.make |
91 | else ifneq (,$(findstring checkwps,$(APP_TYPE))) | 91 | else ifneq (,$(findstring checkwps,$(APP_TYPE))) |
92 | include $(APPSDIR)/checkwps.make | 92 | include $(APPSDIR)/checkwps.make |
93 | include $(ROOTDIR)/lib/skin_parser/skin_parser.make | ||
94 | else ifneq (,$(findstring database,$(APP_TYPE))) | 93 | else ifneq (,$(findstring database,$(APP_TYPE))) |
95 | include $(APPSDIR)/database.make | 94 | include $(APPSDIR)/database.make |
96 | else ifneq (,$(findstring warble,$(APP_TYPE))) | 95 | else ifneq (,$(findstring warble,$(APP_TYPE))) |
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make index 77cd51494a..1ab3fda83c 100644 --- a/uisimulator/uisimulator.make +++ b/uisimulator/uisimulator.make | |||
@@ -30,7 +30,7 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP) | |||
30 | $(SILENT)$(shell rm -f $@) | 30 | $(SILENT)$(shell rm -f $@) |
31 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 31 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
32 | 32 | ||
33 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $(SIMLIB) | 33 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $(SIMLIB) |
34 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) \ | 34 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) \ |
35 | -Wl,-Map,$(BUILDDIR)/rockbox.map | 35 | -Wl,-Map,$(BUILDDIR)/rockbox.map |
36 | 36 | ||