From c0814f64182dbf60b9f0fb001ed334668ee8a162 Mon Sep 17 00:00:00 2001
From: Luca Erbetta <luca.erbetta@skywarder.eu>
Date: Thu, 13 May 2021 17:57:28 +0200
Subject: [PATCH] [SBS] Fix for subprojects
---
sbs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sbs b/sbs
index c7cdf9a97..8dac7780e 100755
--- a/sbs
+++ b/sbs
@@ -282,9 +282,10 @@ def importLibs(path):
stype = conf.get(i, 'Type')
if stype == 'library':
if i not in extlibs:
- extlibs[i] = {'subdir': conf.get(i, 'Subdir'),
- 'libs': [x.strip() for x in conf.get(i, 'Libs').split()],
- 'includes': [x.strip() for x in conf.get(i, 'Includes').split()]}
+ extlibs[i] = {'subdir': projconf['SBS_BASE'] + "/" + conf.get(i, 'Subdir'),
+ 'libs': [projconf['SBS_BASE'] + "/" + x.strip() for x in conf.get(i, 'Libs').split()],
+ 'defines': conf.get(i, 'Defines').strip(),
+ 'includes': [projconf['SBS_BASE'] + "/" + x.strip() for x in conf.get(i, 'Includes').split()]}
else:
print('[SBS] Syntax error in %s: a library group named %s is already defined. Terminating' % (path, i))
exit(1)
--
GitLab