File tree Expand file tree Collapse file tree 2 files changed +19
-3
lines changed
Expand file tree Collapse file tree 2 files changed +19
-3
lines changed Original file line number Diff line number Diff line change 292292 "defines" : {
293293 "readable_name" : " Preprocessor Definitions" ,
294294 "readable_name.zh-cn" : " 预处理器定义" ,
295- "markdownDescription" : " Macro Defines (format: \" <key> SETA <value> \" ) " ,
296- "description.zh-cn" : " 宏定义(格式: \" <key> SETA <value> \" ) " ,
295+ "markdownDescription" : " Macro Defines" ,
296+ "description.zh-cn" : " 宏定义" ,
297297 "type" : " array" ,
298298 "items" : {
299299 "type" : " string"
Original file line number Diff line number Diff line change @@ -726,6 +726,17 @@ class ARMParser extends KeilParser<KeilARMOption> {
726726 }
727727 }
728728 }
729+
730+ // asm defines
731+ // TargetOption.TargetArmAds.Aads.VariousControls.Define
732+ try {
733+ const s = targetOptionObj . TargetArmAds . Aads . VariousControls . Define || '' ;
734+ if ( optionData [ 'asm-compiler' ] == undefined )
735+ optionData [ 'asm-compiler' ] = { } ;
736+ optionData [ 'asm-compiler' ] [ 'defines' ] = this . parseMacroString ( s ) ;
737+ } catch ( error ) {
738+ //nothing todo
739+ }
729740 }
730741
731742 // parse builder tasks
@@ -1369,7 +1380,12 @@ class ARMParser extends KeilParser<KeilARMOption> {
13691380 . join ( ';' ) ;
13701381
13711382 target . TargetOption . TargetArmAds . Cads . VariousControls . Define = mergedDep . defineList . join ( "," ) ; // C/CPP
1372- target . TargetOption . TargetArmAds . Aads . VariousControls . Define = mergedDep . defineList . join ( "," ) ; // ASM
1383+
1384+ const builderOpts = prj . getBuilderOptions ( ) ;
1385+ if ( builderOpts [ "asm-compiler" ] ) {
1386+ const defines = builderOpts [ "asm-compiler" ] [ 'defines' ] || [ ] ;
1387+ target . TargetOption . TargetArmAds . Aads . VariousControls . Define = defines . join ( "," ) ; // ASM
1388+ }
13731389
13741390 this . setOption ( target . TargetOption , prj ) ;
13751391
You can’t perform that action at this time.
0 commit comments