Moving images to separate library in preparation for loading optimization

Source commit: 1e1b57a4df48cd6847e2cc9e714547703f8845a5

source/ScpResources.cbproj

@@ -0,0 +1,104 @@
+	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<ProjectGuid>{F3609D87-2D06-465B-8878-353EAF3E894F}</ProjectGuid>
+		<ProjectVersion>15.4</ProjectVersion>
+		<Config Condition="'$(Config)'==''">Release</Config>
+		<FrameworkType>None</FrameworkType>
+		<Base>True</Base>
+		<Platform Condition="'$(Platform)'==''">Win32</Platform>
+		<TargetedPlatforms>1</TargetedPlatforms>
+		<AppType>StaticLibrary</AppType>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+		<Base>true</Base>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
+		<Cfg_1>true</Cfg_1>
+		<CfgParent>Base</CfgParent>
+		<Base>true</Base>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
+		<Cfg_2>true</Cfg_2>
+		<CfgParent>Base</CfgParent>
+		<Base>true</Base>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Base)'!=''">
+			<_TCHARMapping>wchar_t</_TCHARMapping>
+			<BCC_AllWarnings>true</BCC_AllWarnings>
+			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+			<IncludePath>core\;forms\;windows\;packages\png;packages\tb2k;packages\tbx;$(BDS)\include\windows;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+			<Multithreaded>true</Multithreaded>
+			<ProjectType>CppStaticLibrary</ProjectType>
+			<SanitizedProjectName>ScpResources</SanitizedProjectName>
+		</PropertyGroup>
+	<PropertyGroup Condition="'$(Cfg_1)'!=''">
+			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+			<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
+			<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
+			<BCC_MonitorThis>true</BCC_MonitorThis>
+			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+			<BCC_StackFrames>true</BCC_StackFrames>
+			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+			<DCC_Define>DEBUG</DCC_Define>
+			<DCC_Optimize>false</DCC_Optimize>
+			<Defines>_DEBUG;$(Defines)</Defines>
+			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+			<TASM_Debugging>Full</TASM_Debugging>
+			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+		</PropertyGroup>
+	<PropertyGroup Condition="'$(Cfg_2)'!=''">
+			<Defines>NDEBUG;$(Defines)</Defines>
+			<TASM_Debugging>None</TASM_Debugging>
+		</PropertyGroup>
+	<ItemGroup>
+			<CppCompile Include="forms\Glyphs.cpp">
+			<Form>GlyphsModule</Form>
+			<FormType>dfm</FormType>
+			<DesignClass>TDataModule</DesignClass>
+			<DependentOn>forms\Glyphs.h</DependentOn>
+			<BuildOrder>0</BuildOrder>
+		</CppCompile>
+			<FormResources Include="forms\Glyphs.dfm"/>
+			<BuildConfiguration Include="Base">
+			<Key>Base</Key>
+		</BuildConfiguration>
+			<BuildConfiguration Include="Debug">
+			<Key>Cfg_1</Key>
+			<CfgParent>Base</CfgParent>
+		</BuildConfiguration>
+			<BuildConfiguration Include="Release">
+			<Key>Cfg_2</Key>
+			<CfgParent>Base</CfgParent>
+		</BuildConfiguration>
+		</ItemGroup>
+	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
+	<ProjectExtensions>
+		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
+		<Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>
+		<BorlandProject>
+			<CPlusPlusBuilder.Personality>
+				<ProjectProperties>
+					<ProjectProperties Name="AutoShowDeps">False</ProjectProperties>
+					<ProjectProperties Name="ManagePaths">True</ProjectProperties>
+					<ProjectProperties Name="VerifyPackages">True</ProjectProperties>
+					<ProjectProperties Name="IndexFiles">False</ProjectProperties>
+				</ProjectProperties>
+			</CPlusPlusBuilder.Personality>
+			<Platforms>
+				<Platform value="Win32">True</Platform>
+				<Platform value="Win64">False</Platform>
+			</Platforms>
+		</BorlandProject>
+		<ProjectFileVersion>12</ProjectFileVersion>
+	</ProjectExtensions>
+	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+</Project>

source/WinSCP.cbproj

@@ -106,6 +106,7 @@
 	<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
 			<ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
 			<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Debug\;$(BDS)\lib\Win32\Debug\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+			<LinkPackageStatics>vcl.lib;rtl.lib;vclx.lib;ws2_32.lib;secur32.lib;Moje.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;Crypt32.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;winhttp.lib;jcl.lib;vclie.lib;urlmon.lib;shlwapi.lib;powrprof.lib;soaprtl.lib;fmx.lib</LinkPackageStatics>
 		</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
 			<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Debug\;$(BDS)\lib\Win64\Debug\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
@@ -128,13 +129,6 @@
 			<BuildOrder>21</BuildOrder>
 		</CppCompile>
 			<FormResources Include="forms\CustomScpExplorer.dfm"/>
-			<CppCompile Include="forms\Glyphs.cpp">
-			<Form>GlyphsModule</Form>
-			<DesignClass>TDataModule</DesignClass>
-			<DependentOn>forms\Glyphs.h</DependentOn>
-			<BuildOrder>30</BuildOrder>
-		</CppCompile>
-			<FormResources Include="forms\Glyphs.dfm"/>
 			<CppCompile Include="forms\NonVisual.cpp">
 			<BuildOrder>23</BuildOrder>
 			<Form>NonVisualDataModule</Form>
@@ -265,6 +259,10 @@
 			<LibFiles Include="ScpForms.lib">
 			<BuildOrder>26</BuildOrder>
 			<IgnorePath>true</IgnorePath>
+		</LibFiles>
+			<LibFiles Include="ScpResources.lib">
+			<BuildOrder>26</BuildOrder>
+			<IgnorePath>true</IgnorePath>
 		</LibFiles>
 			<LibFiles Include="ssleay32.lib">
 			<BuildOrder>29</BuildOrder>

source/WinSCP.cpp

@@ -6,7 +6,6 @@ USEFORM("forms\CustomScpExplorer.cpp", CustomScpExplorerForm);
 USEFORM("forms\NonVisual.cpp", NonVisualDataModule); /* TDataModule: File Type */
 USEFORM("forms\ScpCommander.cpp", ScpCommanderForm);
 USEFORM("forms\ScpExplorer.cpp", ScpExplorerForm);
-USEFORM("forms\Glyphs.cpp", GlyphsModule); /* TDataModule: File Type */
 //---------------------------------------------------------------------------
 #include <CoreMain.h>
 #include <WinInterface.h>

source/WinSCP.groupproj

@@ -39,8 +39,11 @@
 			<Projects Include="ScpForms.cbproj">
 				<Dependencies/>
 			</Projects>
+			<Projects Include="ScpResources.cbproj">
+				<Dependencies/>
+			</Projects>
 			<Projects Include="WinSCP.cbproj">
-				<Dependencies>Putty.cbproj;FileZilla.cbproj;ScpCore.cbproj;RScpComp.cbproj;ScpForms.cbproj</Dependencies>
+				<Dependencies>Putty.cbproj;FileZilla.cbproj;ScpCore.cbproj;RScpComp.cbproj;ScpForms.cbproj;ScpResources.cbproj</Dependencies>
 			</Projects>
 			<Projects Include="Console.cbproj">
 				<Dependencies/>
@@ -164,13 +167,22 @@
 		<Target Name="ScpForms:Make">
 			<MSBuild Projects="ScpForms.cbproj" Targets="Make"/>
 		</Target>
-		<Target Name="WinSCP" DependsOnTargets="Putty;FileZilla;ScpCore;RScpComp;ScpForms">
+		<Target Name="ScpResources">
+			<MSBuild Projects="ScpResources.cbproj"/>
+		</Target>
+		<Target Name="ScpResources:Clean">
+			<MSBuild Projects="ScpResources.cbproj" Targets="Clean"/>
+		</Target>
+		<Target Name="ScpResources:Make">
+			<MSBuild Projects="ScpResources.cbproj" Targets="Make"/>
+		</Target>
+		<Target Name="WinSCP" DependsOnTargets="Putty;FileZilla;ScpCore;RScpComp;ScpForms;ScpResources">
 			<MSBuild Projects="WinSCP.cbproj"/>
 		</Target>
-		<Target Name="WinSCP:Clean" DependsOnTargets="Putty:Clean;FileZilla:Clean;ScpCore:Clean;RScpComp:Clean;ScpForms:Clean">
+		<Target Name="WinSCP:Clean" DependsOnTargets="Putty:Clean;FileZilla:Clean;ScpCore:Clean;RScpComp:Clean;ScpForms:Clean;ScpResources:Clean">
 			<MSBuild Projects="WinSCP.cbproj" Targets="Clean"/>
 		</Target>
-		<Target Name="WinSCP:Make" DependsOnTargets="Putty:Make;FileZilla:Make;ScpCore:Make;RScpComp:Make;ScpForms:Make">
+		<Target Name="WinSCP:Make" DependsOnTargets="Putty:Make;FileZilla:Make;ScpCore:Make;RScpComp:Make;ScpForms:Make;ScpResources:Make">
 			<MSBuild Projects="WinSCP.cbproj" Targets="Make"/>
 		</Target>
 		<Target Name="Console">
@@ -192,13 +204,13 @@
 			<MSBuild Projects="DragExt.cbproj" Targets="Make"/>
 		</Target>
 		<Target Name="Build">
-			<CallTarget Targets="Moje;DragDropP;DriveDir;tb2k;tbxp;Jcl;PngComponents;Putty;FileZilla;ScpCore;RScpComp;ScpForms;WinSCP;Console;DragExt"/>
+			<CallTarget Targets="Moje;DragDropP;DriveDir;tb2k;tbxp;Jcl;PngComponents;Putty;FileZilla;ScpCore;RScpComp;ScpForms;ScpResources;WinSCP;Console;DragExt"/>
 		</Target>
 		<Target Name="Clean">
-			<CallTarget Targets="Moje:Clean;DragDropP:Clean;DriveDir:Clean;tb2k:Clean;tbxp:Clean;Jcl:Clean;PngComponents:Clean;Putty:Clean;FileZilla:Clean;ScpCore:Clean;RScpComp:Clean;ScpForms:Clean;WinSCP:Clean;Console:Clean;DragExt:Clean"/>
+			<CallTarget Targets="Moje:Clean;DragDropP:Clean;DriveDir:Clean;tb2k:Clean;tbxp:Clean;Jcl:Clean;PngComponents:Clean;Putty:Clean;FileZilla:Clean;ScpCore:Clean;RScpComp:Clean;ScpForms:Clean;ScpResources:Clean;WinSCP:Clean;Console:Clean;DragExt:Clean"/>
 		</Target>
 		<Target Name="Make">
-			<CallTarget Targets="Moje:Make;DragDropP:Make;DriveDir:Make;tb2k:Make;tbxp:Make;Jcl:Make;PngComponents:Make;Putty:Make;FileZilla:Make;ScpCore:Make;RScpComp:Make;ScpForms:Make;WinSCP:Make;Console:Make;DragExt:Make"/>
+			<CallTarget Targets="Moje:Make;DragDropP:Make;DriveDir:Make;tb2k:Make;tbxp:Make;Jcl:Make;PngComponents:Make;Putty:Make;FileZilla:Make;ScpCore:Make;RScpComp:Make;ScpForms:Make;ScpResources:Make;WinSCP:Make;Console:Make;DragExt:Make"/>
 		</Target>
 		<Import Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')" Project="$(BDS)\Bin\CodeGear.Group.Targets"/>
 	</Project>