Wed May 22 13:21:16 UTC 2019 Chad Elliott <elliott_c@ociweb.com>

        * docs/templates/iar.txt:
        * templates/iar.mpd:
        * templates/iar.mpt:

          Added a 'gruntimelibselect' template variable to change the DLib
          config setting.

Author: ocielliottc

ChangeLog

@@ -1,3 +1,12 @@
+Wed May 22 13:21:16 UTC 2019  Chad Elliott  <elliott_c@ociweb.com>
+
+        * docs/templates/iar.txt:
+        * templates/iar.mpd:
+        * templates/iar.mpt:
+
+          Added a 'gruntimelibselect' template variable to change the DLib
+          config setting.
+
 Tue May 21 11:16:16 UTC 2019  Chad Elliott  <elliott_c@ociweb.com>
 
         * templates/iar.mpd:

docs/templates/iar.txt

@@ -6,10 +6,11 @@
 //
 chip = This will be the chip version used by the UI.
 debug = This will be 1 if in debug mode and 0 if in release mode.
-dlib_config = The configuration header file for the DLib.
+dlib_config = The configuration header file for the DLib.  This is only used if gruntimelibselect is set to 3.
 gendianmode = Corresponds to the Endian mode under General Options.
 gendianmodebe = When General Options Endian mode is Big (1), BE32 is 0 and BE8 is 1.
 generalenablemisra = Set this to 1 to enable MISRA in the General Options.
+gruntimelibselect = Sets the DLib runtime support (0 - None, 1 - Normal, 2 - Full, 3 - Custom).
 ilinkicffile = Set this to override the default ICF file.
 ilinkprogramentrylabel = Use this to override the default program entry name.
 oglastsavedbyproductversion = The version number of the product at the last saving time of the project.

templates/iar.mpd

@@ -59,12 +59,12 @@
                 <option>
                     <name>GRuntimeLibSelect</name>
                     <version>0</version>
-                    <state>2</state>
+		    <state><%gruntimelibselect%></state>
                 </option>
                 <option>
                     <name>GRuntimeLibSelectSlave</name>
                     <version>0</version>
-                    <state>2</state>
+		    <state><%gruntimelibselect%></state>
                 </option>
                 <option>
                     <name>RTDescription</name>
@@ -122,7 +122,17 @@
                 </option>
                 <option>
                     <name>RTConfigPath2</name>
-                    <state>$TOOLKIT_DIR$\inc\c\<%dlib_config(DLib_Config_Normal.h)%></state>
+<%if(compares(gruntimelibselect, 1))%>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
+<%else%>
+<%if(compares(gruntimelibselect, 2))%>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+<%else%>
+<%if(compares(gruntimelibselect, 3))%>
+                    <state><%dlib_config%></state>
+<%endif%>
+<%endif%>
+<%endif%>
                 </option>
                 <option>
                     <name>GBECoreSlave</name>

templates/iar.mpt

@@ -6,6 +6,14 @@ configurations = Debug Release
 toolchain = ARM
 chip = "MK70FN1M0xxx12	NXP MK70FN1M0xxx12"
 
+// GRuntimeLibSelect determines the type of DLib support.
+// You can override this in your mpb file.
+// 0 - None
+// 1 - Normal
+// 2 - Full
+// 3 - Custom
+gruntimelibselect = 1
+
 Debug {
   debug = 1
   lib_modifier = d