forked from wolfSSL/wolfssl
fix tirtos merge
This commit is contained in:
@@ -78,8 +78,7 @@ for (arg = 0; arg < arguments.length; arg++) {
|
||||
|
||||
/* Include Path (needed to find NDK headers) */
|
||||
var ndkPath = "$(NDK_INSTALL_DIR)/packages/ti/ndk/";
|
||||
var cyasslPathInclude = " -I" + ndkPath + "/inc" + " -I" + ndkPath
|
||||
+ "/inc/bsd -DTIRTOS ";
|
||||
var cyasslPathInclude = " -I" + ndkPath + "/inc/bsd -DCYASSL_TIRTOS ";
|
||||
|
||||
/* lib/ is a generated directory that 'xdc clean' should remove */
|
||||
var Pkg = xdc.useModule('xdc.bld.PackageContents');
|
||||
|
@@ -21,13 +21,14 @@ var srcs = [
|
||||
|
||||
for each (var targ in Build.targets) {
|
||||
|
||||
var lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib";
|
||||
var lnkOpts = "";
|
||||
var platform = "ti.platforms.tiva:TM4C1294NCPDT:1";
|
||||
if (targ.$name.match(/^ti/)) {
|
||||
lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib";
|
||||
lnkOpts += " -x ";
|
||||
}
|
||||
else if (targ.$name.match(/^iar/)) {
|
||||
lnkOpts = TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib"
|
||||
lnkOpts = TivaWareDir + "/driverlib/ewarm/Exe/driverlib.a"
|
||||
+ " --config TM4C1294NC.icf";
|
||||
platform = "ti.platforms.tiva:TM4C1294NCPDT";
|
||||
|
||||
@@ -35,7 +36,11 @@ for each (var targ in Build.targets) {
|
||||
var suffix = targ.$orig.lnkOpts.suffix;
|
||||
targ.$orig.lnkOpts.suffix = suffix.replace(/PrintfSmall/, "PrintfFull");
|
||||
}
|
||||
|
||||
else if (targ.$name.match(/^gnu/)) {
|
||||
targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " + " -Wl,--start-group -ldriver -Wl,--end-group ";
|
||||
targ.$orig.bspLib = "rdimon";
|
||||
}
|
||||
|
||||
var exeOptions = {incs: cyasslPathInclude
|
||||
+ " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "
|
||||
+ " -DTIVAWARE -DPART_TM4C1294NCPDT",
|
||||
|
@@ -20,17 +20,23 @@ var srcs = [
|
||||
];
|
||||
|
||||
for each (var targ in Build.targets) {
|
||||
var lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib"
|
||||
|
||||
var lnkOpts = "";
|
||||
var platform = "ti.platforms.tiva:TM4C1294NCPDT:1";
|
||||
if (targ.$name.match(/^ti/)) {
|
||||
lnkOpts = " -l" + TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib";
|
||||
lnkOpts += " -x ";
|
||||
}
|
||||
else if (targ.$name.match(/^iar/)) {
|
||||
lnkOpts = TivaWareDir + "/driverlib/ccs/Debug/driverlib.lib"
|
||||
lnkOpts = TivaWareDir + "/driverlib/ewarm/Exe/driverlib.a"
|
||||
+ " --config TM4C1294NC.icf";
|
||||
platform = "ti.platforms.tiva:TM4C1294NCPDT";
|
||||
}
|
||||
|
||||
else if (targ.$name.match(/^gnu/)) {
|
||||
targ.$orig.lnkOpts.suffix += " -L" + TivaWareDir + "/driverlib/gcc " + " -Wl,--start-group -ldriver -Wl,--end-group ";
|
||||
targ.$orig.bspLib = "rdimon";
|
||||
}
|
||||
|
||||
var exeOptions = {incs: cyasslPathInclude
|
||||
+ " -DNO_MAIN_DRIVER -D_INCLUDE_NIMU_CODE -DBENCH_EMBEDDED "
|
||||
+ " -DTIVAWARE -DPART_TM4C1294NCPDT",
|
||||
|
Reference in New Issue
Block a user