Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't include unwarminder for checkwps, database and warble.

Browse source 
If the host is ARM simply checking the architecture the compiler produces
binaries for will include unwarminder even for the PC tools, breaking them.

Fixes building checkwps and database on ARM hosts. Doesn't fix warble, there
are additional problems with that.

Change-Id: I135b1103a60b9e3720117cde1075b7d73424f384
This commit is contained in:
Dominik Riebeling 2013-03-13 21:40:04 +01:00
parent 027c035a4e
commit 962368571e
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/root.make
View file

@ -71,6 +71,9 @@ ifeq (,$(findstring checkwps,$(APP_TYPE)))
ifeq (,$(findstring warble,$(APP_TYPE)))
include $(FIRMDIR)/firmware.make
include $(ROOTDIR)/apps/bitmaps/bitmaps.make
ifeq (arch_arm,$(ARCH))
include $(ROOTDIR)/lib/unwarminder/unwarminder.make
endif
ifeq (,$(findstring bootloader,$(APPSDIR)))
include $(ROOTDIR)/lib/skin_parser/skin_parser.make
include $(ROOTDIR)/lib/tlsf/libtlsf.make
@ -87,10 +90,6 @@ ifndef APP_TYPE
endif
endif
ifeq (arch_arm,$(ARCH))
include $(ROOTDIR)/lib/unwarminder/unwarminder.make
endif
ifneq (,$(findstring bootloader,$(APPSDIR)))
include $(APPSDIR)/bootloader.make
else ifneq (,$(findstring bootbox,$(APPSDIR)))