--- a/AbstractSettingsApplication.st	Fri Jan 20 16:38:40 2012 +0100
+++ b/AbstractSettingsApplication.st	Sun Jan 22 11:06:48 2012 +0100
@@ -20,7 +20,7 @@
 !
 
 AbstractSettingsApplication subclass:#BuildSettingsAppl
-	instanceVariableNames:'buildDirectory localBuild'
+	instanceVariableNames:'buildDirectory localBuild selectedCompiler usedCompilerForBuild'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:AbstractSettingsApplication
@@ -715,7 +715,7 @@
           label: 'Build Settings'
           name: 'Build Settings'
           min: (Point 10 10)
-          bounds: (Rectangle 0 0 659 551)
+          bounds: (Rectangle 0 0 659 242)
         )
         component: 
        (SpecCollection
@@ -739,8 +739,26 @@
                    (SpecCollection
                       collection: (
                        (ViewSpec
+                          name: 'LocalBuild'
+                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                          component: 
+                         (SpecCollection
+                            collection: (
+                             (CheckBoxSpec
+                                label: 'Local Build (Do not use Repository)'
+                                name: 'CheckBox4'
+                                layout: (LayoutFrame 2 0 5 0 -5 1 27 0)
+                                enableChannel: hasSourceCodeManager
+                                model: localBuild
+                                translateLabel: true
+                              )
+                             )
+                           
+                          )
+                        )
+                       (ViewSpec
                           name: 'Build Directory'
-                          layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+                          layout: (LayoutFrame 0 0 40 0 0 1 70 0)
                           component: 
                          (SpecCollection
                             collection: (
@@ -769,7 +787,7 @@
                         )
                        (HorizontalPanelViewSpec
                           name: 'ActionsHorizontalPanel'
-                          layout: (LayoutFrame 62 0.25 27 0 0 1 56 0)
+                          layout: (LayoutFrame 62 0.25 67 0 0 1 96 0)
                           horizontalLayout: fitSpace
                           verticalLayout: center
                           horizontalSpace: 3
@@ -792,20 +810,26 @@
                        )
                      
                     )
-                    extent: (Point 659 91)
-                  )
-                 (ViewSpec
-                    name: 'LocalBuild'
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (CheckBoxSpec
-                          label: 'Local Build (Do not use Repository)'
-                          name: 'CheckBox4'
-                          layout: (LayoutFrame 2 0 5 0 -5 1 27 0)
-                          enableChannel: hasSourceCodeManager
-                          model: localBuild
-                          translateLabel: true
+                    extent: (Point 659 128)
+                  )
+                 (ViewSpec
+                    name: 'Box1'
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (LabelSpec
+                          label: 'Compiler for Build:'
+                          name: 'Label1'
+                          layout: (LayoutFrame 0 0 0 0 150 0 22 0)
+                          translateLabel: true
+                          adjust: right
+                        )
+                       (ComboListSpec
+                          name: 'ComboList1'
+                          layout: (LayoutFrame 150 0 0 0 300 0 20 0)
+                          model: usedCompilerForBuild
+                          comboList: listOfPossibleCompilers
+                          useIndex: false
                         )
                        )
                      
@@ -820,6 +844,8 @@
          
         )
       )
+
+    "Modified: / 22-01-2012 / 10:59:44 / cg"
 ! !
 
 !AbstractSettingsApplication::BuildSettingsAppl methodsFor:'actions'!
@@ -830,8 +856,15 @@
             #( 
                 buildDirectory
                 localBuild
+                usedCompilerForBuild
             )
         from:currentUserPrefs.
+
+    usedCompilerForBuild value isNil ifTrue:[
+        usedCompilerForBuild value:(Tools::ProjectBuilder defaultUsedCompiler)
+    ].
+
+    "Modified: / 22-01-2012 / 10:59:03 / cg"
 !
 
 basicSaveSettings
@@ -855,8 +888,11 @@
             #( 
                 buildDirectory
                 localBuild
+                usedCompilerForBuild
             )
         to:currentUserPrefs.
+
+    "Modified: / 22-01-2012 / 10:50:09 / cg"
 !
 
 cleanupBuildDirectory
@@ -887,12 +923,28 @@
     ^ SourceCodeManager notNil
 !
 
+listOfPossibleCompilers
+    ^ Tools::ProjectBuilder listOfPossibleCompilers
+
+    "Created: / 21-01-2012 / 14:05:43 / cg"
+!
+
 localBuild
     localBuild isNil ifTrue:[
         localBuild := UserPreferences current localBuild asValue.
         localBuild onChangeSend:#updateModifiedChannel to:self
     ].
     ^ localBuild.
+!
+
+usedCompilerForBuild
+    usedCompilerForBuild isNil ifTrue:[
+        usedCompilerForBuild := nil asValue.
+        usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self
+    ].
+    ^ usedCompilerForBuild.
+
+    "Created: / 22-01-2012 / 10:59:30 / cg"
 ! !
 
 !AbstractSettingsApplication::BuildSettingsAppl methodsFor:'help'!
@@ -917,10 +969,13 @@
             #(
                 buildDirectory
                 localBuild
+                usedCompilerForBuild
             )
         asComparedTo:currentUserPrefs) ifTrue:[^ true].
 
     ^ false
+
+    "Modified: / 22-01-2012 / 10:50:15 / cg"
 ! !
 
 !AbstractSettingsApplication::ByteCodeCompilerSettingsAppl class methodsFor:'defaults'!
@@ -16567,9 +16622,9 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.418 2012-01-19 09:59:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.419 2012-01-22 10:06:48 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.418 2012-01-19 09:59:19 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.419 2012-01-22 10:06:48 cg Exp $'
+! !