Skip to content

Commit

Permalink
Merge pull request #41 from adrianosantostreina/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
adrianosantostreina authored Sep 24, 2024
2 parents eb0afc9 + 6c58b92 commit eec6652
Show file tree
Hide file tree
Showing 12 changed files with 1,617 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@ Samples/# Default Sample/iOSSimARM64/Debug/DefaultSample.dSYM
Samples/# Default Sample/iOSDevice64/Debug/DefaultSample
Samples/# Default Sample/iOSSimARM64/Debug/DefaultSample
Samples/Linux/horse/bin/HorseLinux_MultiLog4D
Samples/FMX/GUI/Linux64/Debug/GUI_MultiLog4D
18 changes: 15 additions & 3 deletions MultiLog4D.groupproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<Projects Include="Samples\Linux\horse\HorseLinux_MultiLog4D.dproj">
<Dependencies/>
</Projects>
<Projects Include="Samples\FMX\GUI\GUI_MultiLog4D.dproj">
<Dependencies/>
</Projects>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Default.Personality.12</Borland.Personality>
Expand Down Expand Up @@ -107,14 +110,23 @@
<Target Name="HorseLinux_MultiLog4D:Make">
<MSBuild Projects="Samples\Linux\horse\HorseLinux_MultiLog4D.dproj" Targets="Make"/>
</Target>
<Target Name="GUI_MultiLog4D">
<MSBuild Projects="Samples\FMX\GUI\GUI_MultiLog4D.dproj"/>
</Target>
<Target Name="GUI_MultiLog4D:Clean">
<MSBuild Projects="Samples\FMX\GUI\GUI_MultiLog4D.dproj" Targets="Clean"/>
</Target>
<Target Name="GUI_MultiLog4D:Make">
<MSBuild Projects="Samples\FMX\GUI\GUI_MultiLog4D.dproj" Targets="Make"/>
</Target>
<Target Name="Build">
<CallTarget Targets="DefaultSample;Android_MultiLog4D;iOS_MultiLog4D;Horse_MultiLog4D;Console_MultiLog4D;VCL_MultiLog4D;Service_MultiLog4D;HorseLinux_MultiLog4D"/>
<CallTarget Targets="DefaultSample;Android_MultiLog4D;iOS_MultiLog4D;Horse_MultiLog4D;Console_MultiLog4D;VCL_MultiLog4D;Service_MultiLog4D;HorseLinux_MultiLog4D;GUI_MultiLog4D"/>
</Target>
<Target Name="Clean">
<CallTarget Targets="DefaultSample:Clean;Android_MultiLog4D:Clean;iOS_MultiLog4D:Clean;Horse_MultiLog4D:Clean;Console_MultiLog4D:Clean;VCL_MultiLog4D:Clean;Service_MultiLog4D:Clean;HorseLinux_MultiLog4D:Clean"/>
<CallTarget Targets="DefaultSample:Clean;Android_MultiLog4D:Clean;iOS_MultiLog4D:Clean;Horse_MultiLog4D:Clean;Console_MultiLog4D:Clean;VCL_MultiLog4D:Clean;Service_MultiLog4D:Clean;HorseLinux_MultiLog4D:Clean;GUI_MultiLog4D:Clean"/>
</Target>
<Target Name="Make">
<CallTarget Targets="DefaultSample:Make;Android_MultiLog4D:Make;iOS_MultiLog4D:Make;Horse_MultiLog4D:Make;Console_MultiLog4D:Make;VCL_MultiLog4D:Make;Service_MultiLog4D:Make;HorseLinux_MultiLog4D:Make"/>
<CallTarget Targets="DefaultSample:Make;Android_MultiLog4D:Make;iOS_MultiLog4D:Make;Horse_MultiLog4D:Make;Console_MultiLog4D:Make;VCL_MultiLog4D:Make;Service_MultiLog4D:Make;HorseLinux_MultiLog4D:Make;GUI_MultiLog4D:Make"/>
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project>
1 change: 1 addition & 0 deletions Samples/# Default Sample/DefaultSample.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -1916,6 +1916,7 @@
<Platform value="Android64">True</Platform>
<Platform value="iOSDevice64">True</Platform>
<Platform value="iOSSimARM64">True</Platform>
<Platform value="Linux64">False</Platform>
<Platform value="OSX64">True</Platform>
<Platform value="OSXARM64">True</Platform>
<Platform value="Win32">True</Platform>
Expand Down
1 change: 1 addition & 0 deletions Samples/FMX/Android/Android_MultiLog4D.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -1601,6 +1601,7 @@
<Platform value="Android64">True</Platform>
<Platform value="iOSDevice64">True</Platform>
<Platform value="iOSSimARM64">True</Platform>
<Platform value="Linux64">False</Platform>
<Platform value="OSX64">True</Platform>
<Platform value="OSXARM64">True</Platform>
<Platform value="Win32">True</Platform>
Expand Down
44 changes: 44 additions & 0 deletions Samples/FMX/GUI/GUI_MultiLog4D.deployproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Condition="Exists('$(BDS)\bin\CodeGear.Deployment.targets')" Project="$(BDS)\bin\CodeGear.Deployment.targets"/>
<ProjectExtensions>
<ProjectFileVersion>12</ProjectFileVersion>
</ProjectExtensions>
<PropertyGroup>
<DeviceId Condition="'$(Platform)'=='Android'"/>
<DeviceId Condition="'$(Platform)'=='Android64'"/>
<DeviceId Condition="'$(Platform)'=='iOSDevice64'">00008101-0002651A0221001E</DeviceId>
<DeviceId Condition="'$(Platform)'=='iOSSimARM64'">52740D33-2E76-45AF-BE8C-B1C14E6EFEB4</DeviceId>
</PropertyGroup>
<ItemGroup Condition="'$(Platform)'=='OSX64'"/>
<ItemGroup Condition="'$(Platform)'=='Win32'">
<DeployFile Include="Win32\Debug\GUI_MultiLog4D.exe" Condition="'$(Config)'=='Debug'">
<RemoteDir>GUI_MultiLog4D\</RemoteDir>
<RemoteName>GUI_MultiLog4D.exe</RemoteName>
<DeployClass>ProjectOutput</DeployClass>
<Operation>0</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
<Required>True</Required>
</DeployFile>
</ItemGroup>
<ItemGroup Condition="'$(Platform)'=='Android64'"/>
<ItemGroup Condition="'$(Platform)'=='Android'"/>
<ItemGroup Condition="'$(Platform)'=='OSXARM64'"/>
<ItemGroup Condition="'$(Platform)'=='Win64'"/>
<ItemGroup Condition="'$(Platform)'=='iOSDevice64'"/>
<ItemGroup Condition="'$(Platform)'=='iOSSimARM64'"/>
<ItemGroup Condition="'$(Platform)'=='Win64x'"/>
<ItemGroup Condition="'$(Platform)'=='Linux64'">
<DeployFile Include="Linux64\Debug\GUI_MultiLog4D" Condition="'$(Config)'=='Debug'">
<RemoteDir>GUI_MultiLog4D\</RemoteDir>
<RemoteName>GUI_MultiLog4D</RemoteName>
<DeployClass>ProjectOutput</DeployClass>
<Operation>1</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
<Required>True</Required>
</DeployFile>
</ItemGroup>
</Project>
21 changes: 21 additions & 0 deletions Samples/FMX/GUI/GUI_MultiLog4D.dpr
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
program GUI_MultiLog4D;

uses
MultiLog4D.Util,
MultiLog4D.Types,
System.StartUpCopy,
FMX.Forms,
Unit4 in 'Unit4.pas' {Form4};

{$R *.res}

begin
TMultiLog4DUtil
.Logger
.Tag('MultiLog4D')
.LogWriteInformation('Start');

Application.Initialize;
Application.CreateForm(TForm4, Form4);
Application.Run;
end.
Loading

0 comments on commit eec6652

Please sign in to comment.