summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/Makefile.libs1
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro6
2 files changed, 7 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs
index 938426f124..ac4e31a9e4 100644
--- a/rbutil/rbutilqt/Makefile.libs
+++ b/rbutil/rbutilqt/Makefile.libs
@@ -32,6 +32,7 @@ export CXXFLAGS=$(EXTRALIB_CXXFLAGS)
32export CC=$(EXTRALIBS_CC) 32export CC=$(EXTRALIBS_CC)
33export CXX=$(EXTRALIBS_CXX) 33export CXX=$(EXTRALIBS_CXX)
34export AR=$(EXTRALIBS_AR) 34export AR=$(EXTRALIBS_AR)
35export ISYSROOT=$(EXTRALIB_ISYSROOT)
35 36
36libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch librbtomcrypt 37libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch librbtomcrypt
37 38
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 9d7da92dbf..a7d0a179e6 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -35,6 +35,12 @@ EXTRALIBS_OPTS += EXTRALIBS_CC=\"$$QMAKE_CC\"
35EXTRALIBS_OPTS += EXTRALIBS_CXX=\"$$QMAKE_CXX\" 35EXTRALIBS_OPTS += EXTRALIBS_CXX=\"$$QMAKE_CXX\"
36EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\" 36EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\"
37EXTRALIBS_OPTS += EXTRALIB_CXXFLAGS=\"$$MACHINEFLAGS\" 37EXTRALIBS_OPTS += EXTRALIB_CXXFLAGS=\"$$MACHINEFLAGS\"
38macx {
39# on recent macOS we need to pass isysroot to the libs, otherwise it won't find
40# the standard libaries. This is caused by the passed compiler (doesn't rely on
41# default compiler but passed full path)
42 EXTRALIBS_OPTS += EXTRALIB_ISYSROOT=\"$$QMAKE_MAC_SDK.macosx.Path\"
43}
38 44
39MYBUILDDIR = $$OUT_PWD/build/ 45MYBUILDDIR = $$OUT_PWD/build/
40MYLIBBUILDDIR = $$MYBUILDDIR/libs/ 46MYLIBBUILDDIR = $$MYBUILDDIR/libs/