Remove use of Vcl.Consts from Compiler.Compile so ISCmplr doesn't use…

… any Vcl unit.
jrsoftware · Aug 7, 2024 · b601c2e · b601c2e
1 parent 2787613
commit b601c2e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Projects/ISCmplr.dproj b/Projects/ISCmplr.dproj
@@ -42,7 +42,7 @@
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=Jordan Russell;FileDescription=Inno Setup Compiler;FileVersion=0.0.0.0;InternalName=;LegalCopyright=Copyright (C) 1997-2008 Jordan Russell. Portions Copyright (C) 2000-2008 Martijn Laan.;LegalTrademarks=;OriginalFilename=;ProductName=Inno Setup;ProductVersion=0.0.0.0;Comments=Inno Setup home page: http://www.innosetup.com</VerInfo_Keys>
-        <DCC_Namespace>System;System.Win;Winapi;Vcl;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System;System.Win;Winapi;$(DCC_Namespace)</DCC_Namespace>
         <DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
         <DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
         <DCC_UNSAFE_CAST>false</DCC_UNSAFE_CAST>

diff --git a/Projects/Src/Compiler.Compile.pas b/Projects/Src/Compiler.Compile.pas
@@ -30,8 +30,7 @@   EISCompileError = class(Exception);
 implementation
 
 uses
-  Shared.PreprocInt, Commctrl, Vcl.Consts { Vcl prefix for ISCC's STATICCOMPILER support }, Classes,
-  IniFiles, TypInfo, AnsiStrings, Math, Generics.Collections, StrUtils, WideStrUtils,
+  Shared.PreprocInt, Commctrl, 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,
@@ -4815,9 +4814,9 @@ function SpaceString(const S: String): String;
 
 var
   MenuKeyCaps: array[TMenuKeyCap] of string = (
-    SmkcBkSp, SmkcTab, SmkcEsc, SmkcEnter, SmkcSpace, SmkcPgUp,
-    SmkcPgDn, SmkcEnd, SmkcHome, SmkcLeft, SmkcUp, SmkcRight,
-    SmkcDown, SmkcIns, SmkcDel, SmkcShift, SmkcCtrl, SmkcAlt);
+    'BkSp', 'Tab', 'Esc', 'Enter', 'Space', 'PgUp',
+    'PgDn', 'End', 'Home', 'Left', 'Up', 'Right',
+    'Down', 'Ins', 'Del', 'Shift', 'Ctrl+', 'Alt+');
 
 procedure TSetupCompiler.EnumIconsProc(const Line: PChar; const Ext: Integer);
 

diff --git a/compile.bat b/compile.bat
@@ -52,7 +52,7 @@ if errorlevel 1 goto failed
 
 echo - ISCmplr.dpr
 mkdir Dcu\ISCmplr.dpr 2>nul
-"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSSystem;System.Win;Winapi;Vcl -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components\UniPs\Source" -E..\Files -NUDcu\ISCmplr.dpr -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS ISCmplr.dpr
+"%DELPHIXEROOT%\bin\dcc32.exe" --no-config -NSSystem;System.Win;Winapi -Q -B -H -W %DELPHIXEDISABLEDWARNINGS% %1 -U"%DELPHIXEROOT%\lib\win32\release;..\Components\UniPs\Source" -E..\Files -NUDcu\ISCmplr.dpr -DPS_MINIVCL;PS_NOGRAPHCONST;PS_PANSICHAR;PS_NOINTERFACEGUIDBRACKETS ISCmplr.dpr
 if errorlevel 1 goto failed
 
 echo - SetupLdr.dpr