diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-05-09 16:11:00 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-05-09 16:11:00 +0200 |
| commit | 9e9f692678b5aefa68923a5b3301a4bd2ab5d03f (patch) | |
| tree | a129cc7159321f7aeb7e587c313a4f5d2a0d4f7a /rbutil | |
| parent | d04bd89bbd954112f4665b21e63f57f7d7aee2d7 (diff) | |
| download | rockbox-9e9f692678b5aefa68923a5b3301a4bd2ab5d03f.tar.gz rockbox-9e9f692678b5aefa68923a5b3301a4bd2ab5d03f.zip | |
Fix Rockbox Utility building on OS X.
Fix a typo that broke building. Also extend the extralibs Makefile to allow
calling it directly.
Change-Id: I2d4dd1689a8654a6b092dfcc58d2753423831816
Diffstat (limited to 'rbutil')
| -rw-r--r-- | rbutil/rbutilqt/Makefile.libs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs index b3a4c31910..a3119f28fc 100644 --- a/rbutil/rbutilqt/Makefile.libs +++ b/rbutil/rbutilqt/Makefile.libs @@ -12,15 +12,23 @@ endif TARGET_DIR ?= $(abspath .)/build/ BUILD_DIR ?= $(abspath .)/build/ +# allow using this Makefile directly. Otherwise those variables are set via +# the generated one. +ifndef RBBASE_DIR +RBBASE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../../ +endif +EXTRALIBS_CC ?= gcc +EXTRALIBS_AR ?= ar # re-export variables that might have been set via command line. # If set via command line sub-makefiles cannot override them, so use different # variable names in the calling makefile. export SYS_SPEEX export TARGET_DIR +export RBBASE_DIR export CFLAGS=$(EXTRALIB_CFLAGS) export CC=$(EXTRALIBS_CC) -export AR=$(EXTRALIB_AR) +export AR=$(EXTRALIBS_AR) libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot |