IDE: save compiler option conditionals

git-svn-id: trunk@27126 -

ide/compileroptions.pp

@@ -94,6 +94,7 @@
       - on renaming
       - on loading
   - when package is renamed, rename macros too
+  - conditionals for project
   - i18n for descriptions
   - keyword help for a build macro
 
@@ -1031,7 +1032,6 @@ begin
   FreeThenNil(fExecuteBefore);
   FreeThenNil(fExecuteAfter);
   FreeThenNil(FParsedOpts);
-  FreeThenNil(FConditionals); // free FConditionals before FParsedOpts
   inherited Destroy;
 end;
 

ide/frames/compiler_buildmacro_options.lfm

@@ -120,6 +120,7 @@ object CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame
       ParentColor = False
       ParentFont = False
       TabOrder = 0
+      OnExit = CondSynEditExit
       Gutter.Width = 55
       Gutter.MouseActions = <      
         item

ide/frames/compiler_buildmacro_options.pas

@@ -18,7 +18,8 @@
  ***************************************************************************
 
   Abstract:
-    Frame to edit build macros of compiler options (project+packages).
+    Frame to edit build macros and conditionals of compiler options
+    (project+packages).
 
 }
 unit Compiler_BuildMacro_Options;
@@ -61,6 +62,7 @@ type
       var AllowEdit: Boolean);
     procedure BuildMacrosTreeViewSelectionChanged(Sender: TObject);
     procedure BuildMacrosTVPopupMenuPopup(Sender: TObject);
+    procedure CondSynEditExit(Sender: TObject);
     procedure DeleteBuildMacroClick(Sender: TObject);
     procedure NewBuildMacroClick(Sender: TObject);
     procedure NewValueClick(Sender: TObject);
@@ -220,6 +222,11 @@ begin
     Add('Delete build macro ...',@DeleteBuildMacroClick);
 end;
 
+procedure TCompOptBuildMacrosFrame.CondSynEditExit(Sender: TObject);
+begin
+  Options.Conditionals:=CondSynEdit.Lines.Text;
+end;
+
 procedure TCompOptBuildMacrosFrame.BuildMacrosTreeViewEditing(Sender: TObject;
   Node: TTreeNode; var AllowEdit: Boolean);
 var