Fix STATICCOMPILER and STATICPREPROC.

Projects/ISCC.dpr

@@ -12,14 +12,16 @@ program ISCC;
 
 {x$DEFINE STATICCOMPILER}
 { For debugging purposes, remove the 'x' to have it link the compiler code
-  into this program and not depend on ISCmplr.dll. }
+  into this program and not depend on ISCmplr.dll. You will also need to add the
+  ..\Components and Src folders to the Delphi Compiler Search path in the project
+  options. Also see IDE.MainForm's STATICCOMPILER and Compiler.Compile's STATICPREPROC. }
 
 uses
   SafeDLLPath in '..\Components\SafeDLLPath.pas',
   Windows,
   SysUtils,
   Classes,
-  {$IFDEF STATICCOMPILER} ISCmplr.Compile in 'Src\ISCmplr\ISCmplr.Compile.pas', {$ENDIF}
+  Compiler.Compile,
   PathFunc in '..\Components\PathFunc.pas',
   Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
   Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',

Projects/Src/Compiler.Compile.pas

@@ -13,7 +13,7 @@ unit Compiler.Compile;
 { For debugging purposes, remove the 'x' to have it link the ISPP code into this
   program and not depend on ISPP.dll. You will also need to add the Src
   folder to the Delphi Compiler Search path in the project options. Most useful
-  when combine with IDE.MainForm's STATICCOMPILER. }
+  when combined with IDE.MainForm's or ISCC's STATICCOMPILER. }
 
 interface
 
@@ -30,13 +30,13 @@ type
 implementation
 
 uses
-  Shared.PreprocInt, Commctrl, Consts, Classes, IniFiles, TypInfo, AnsiStrings, Math,
-  Generics.Collections, StrUtils, WideStrUtils,
+  Shared.PreprocInt, Commctrl, Vcl.Consts { Vcl prefix for ISCC's STATICCOMPILER support }, Classes,
+  IniFiles, TypInfo, AnsiStrings, Math, Generics.Collections, StrUtils, WideStrUtils,
   PathFunc, Shared.CommonFunc, Shared.Struct, Shared.Int64Em, Compiler.Messages, Shared.SetupEntFunc,
   Shared.FileClass, Compression.Base, Compression.Zlib, Compression.bzlib, Compression.LZMACompressor, Shared.ArcFour, SHA1,
   Shared.SetupMessageIDs, Shared.SetupSectionDirectives, Shared.LangOptionsSectionDirectives, Shared.DebugStruct, Shared.VerInfoFunc, Shared.ResUpdateFunc, Compiler.ExeUpdateFunc,
 {$IFDEF STATICPREPROC}
-  IsppPreprocess,
+  ISPP.Preprocess,
 {$ENDIF}
   Compiler.ScriptCompiler, SimpleExpression, Shared.SetupTypes;
 

Projects/Src/IDE.MainForm.pas

@@ -12,8 +12,8 @@
 {x$DEFINE STATICCOMPILER}
 { For debugging purposes, remove the 'x' to have it link the compiler code into
   this program and not depend on ISCmplr.dll. You will also need to add the
-  ..\Components and Src folders to the Delphi Compiler Search path
-  in the project options. Also see Compiler.Compile's STATICPREPROC. }
+  ..\Components and Src folders to the Delphi Compiler Search path in the project
+  options. Also see ISCC's STATICCOMPILER and Compiler.Compile's STATICPREPROC. }
 
 {$IFDEF STATICCOMPILER}
 {$R ..\Res\ISCmplr.images.res}
@@ -653,7 +653,7 @@ uses
   Math, StrUtils, WideStrUtils,
   PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, NewUxTheme.TmSchema, BrowseFunc,
   IDE.HtmlHelpFunc, TaskbarProgressFunc,
-  {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
+  {$IFDEF STATICCOMPILER} Compiler.Compile, {$ENDIF}
   IDE.OptionsForm, IDE.StartupForm, IDE.Wizard.WizardForm, IDE.SignToolsForm,
   Shared.ConfigIniFile, Shared.SignToolsFunc, IDE.InputQueryComboForm, IDE.MsgBoxDesignerForm,
   IDE.FilesDesignerForm, IDE.RegistryDesignerForm, IDE.Wizard.WizardFormRegistryHelper;