STC settings cleanup: show builtin include directories jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 09 Dec 2015 20:46:36 +0000
branchjv
changeset 15986 df48308c20cf
parent 15985 62b9a70f8323
child 15989 f5bcfbde2c3d
STC settings cleanup: show builtin include directories ...in addition to extra ones.
AbstractSettingsApplication.st
--- a/AbstractSettingsApplication.st	Sat Dec 05 07:23:08 2015 +0000
+++ b/AbstractSettingsApplication.st	Wed Dec 09 20:46:36 2015 +0000
@@ -12469,15 +12469,18 @@
     ^ super helpSpec addPairsFrom:#(
 
 #ccOptions
-'Additional flags to pass to the C compiler when compiling a module. 
-In most cases this can be left empty.'
+'Additional flags to pass to the C compiler when compiling a module. In most cases this can be left empty.'
 
 #ccOptionsBuiltin
 'These options are always passed to the C compiler.'
 
+#stcIncludes
+'Extra C compiler include directories where to search for header files.\This may be left empty, but if you use some third-party C library in your inline C code, you may want to add some extra directories here.'
+
+#stcIncludesBuiltin
+'Builtin C compiler include directories that are always used.'
+
 )
-
-    "Modified: / 09-12-2015 / 09:58:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !AbstractSettingsApplication::STCCompilerSettingsAppl class methodsFor:'image specs'!
@@ -12855,7 +12858,38 @@
                    extent: (Point 600 30)
                  )
                 (ViewSpec
-                   name: 'IncludeDirectoriesBox5'
+                   name: 'CCIncludeDirectoriesBox2'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Builtin Include Directories:'
+                         name: 'Label19'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         activeHelpKey: stcIncludesBuiltin
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField14'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         activeHelpKey: stcIncludesBuiltin
+                         initiallyDisabled: true
+                         enableChannel: canLoadBinaries
+                         model: stcIncludesBuiltin
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 29)
+                 )
+                (ViewSpec
+                   name: 'CCIncludeDirectoriesBox2'
                    component: 
                   (SpecCollection
                      collection: (
@@ -12863,12 +12897,14 @@
                          label: 'Include Directories:'
                          name: 'Label5'
                          layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         activeHelpKey: stcIncludes
                          translateLabel: true
                          adjust: right
                        )
                       (InputFieldSpec
                          name: 'EntryField5'
                          layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         activeHelpKey: stcIncludes
                          enableChannel: canLoadBinaries
                          model: stcIncludes
                          acceptOnLeave: true
@@ -13450,6 +13486,12 @@
     ^ stcIncludes.
 !
 
+stcIncludesBuiltin
+    ^ STCCompilerInterface builtinCIncludeDirectories
+
+    "Modified: / 09-12-2015 / 17:08:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 stcKeepCIntermediate
     stcKeepCIntermediate isNil ifTrue:[
 	stcKeepCIntermediate := false asValue.