len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix sim/checkwps build failure.

Browse source 
Change-Id: Iefd533fe26495a29f8e79113b38748b504d94213
This commit is contained in:
Thomas Martitz 2012-03-26 23:16:48 +02:00
parent f269aa0060
commit 54e00c18a3
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tools/checkwps/checkwps.make
View file

@ -7,9 +7,12 @@
# $Id$ # $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 \ INCLUDES = -I$(ROOTDIR)/apps/gui \
-I$(ROOTDIR)/apps/gui/skin_engine \ -I$(ROOTDIR)/apps/gui/skin_engine \
@ -24,11 +27,11 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \
-I$(APPSDIR) \ -I$(APPSDIR) \
-I$(BUILDDIR) -I$(BUILDDIR)
# Makes mkdepfile happy include $(ROOTDIR)/lib/skin_parser/skin_parser.make
GCCOPTS+=-D__PCTOOL__ -DCHECKWPS -g
.SECONDEXPANSION: # $$(OBJ) is not populated until after this .SECONDEXPANSION: # $$(OBJ) is not populated until after this
$(BUILDDIR)/$(BINARY): $$(OBJ) $$(SKINLIB) $(BUILDDIR)/$(BINARY): $$(CHECKWPS_OBJ) $(CORE_LIBS)
@echo LD $(BINARY) @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))

1
tools/root.make
View file

@ -90,7 +90,6 @@ else ifneq (,$(findstring bootbox,$(APPSDIR)))
include $(APPSDIR)/bootbox.make include $(APPSDIR)/bootbox.make
else ifneq (,$(findstring checkwps,$(APP_TYPE))) else ifneq (,$(findstring checkwps,$(APP_TYPE)))
include $(APPSDIR)/checkwps.make include $(APPSDIR)/checkwps.make
include $(ROOTDIR)/lib/skin_parser/skin_parser.make
else ifneq (,$(findstring database,$(APP_TYPE))) else ifneq (,$(findstring database,$(APP_TYPE)))
include $(APPSDIR)/database.make include $(APPSDIR)/database.make
else ifneq (,$(findstring warble,$(APP_TYPE))) else ifneq (,$(findstring warble,$(APP_TYPE)))

2
uisimulator/uisimulator.make
View file

@ -30,7 +30,7 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP)
$(SILENT)$(shell rm -f $@) $(SILENT)$(shell rm -f $@)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null $(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) \ $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) \
-Wl,-Map,$(BUILDDIR)/rockbox.map -Wl,-Map,$(BUILDDIR)/rockbox.map