|
From: <CW...@us...> - 2012-03-29 18:26:57
|
Revision: 1525
http://graphics32.svn.sourceforge.net/graphics32/?rev=1525&view=rev
Author: CWBudde
Date: 2012-03-29 18:26:50 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
* updated sprites demo with respect to Lazarus
Modified Paths:
--------------
trunk/Source/Examples/Vcl/Layers/Sprites_Ex/MainUnit.pas
trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.lpi
trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.lpr
trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.res
Modified: trunk/Source/Examples/Vcl/Layers/Sprites_Ex/MainUnit.pas
===================================================================
--- trunk/Source/Examples/Vcl/Layers/Sprites_Ex/MainUnit.pas 2012-03-29 08:19:40 UTC (rev 1524)
+++ trunk/Source/Examples/Vcl/Layers/Sprites_Ex/MainUnit.pas 2012-03-29 18:26:50 UTC (rev 1525)
@@ -49,9 +49,6 @@
MAX_RUNS = 3;
type
-
- { TMainForm }
-
TMainForm = class(TForm)
bAdd: TButton;
bBenchmark: TButton;
@@ -87,7 +84,7 @@
BenchmarkList: TStringList;
procedure IdleHandler(Sender: TObject; var Done: Boolean);
- procedure AddLayers(Count: Integer);
+ procedure AddLayers(Count: Integer);
end;
var
@@ -95,8 +92,10 @@
implementation
-{$IFNDEF FPC}
-{$R *.DFM}
+{$IFDEF FPC}
+{$R *.lfm}
+{$ELSE}
+{$R *.dfm}
{$ENDIF}
uses
@@ -110,6 +109,8 @@
{$ENDIF}
GR32_Filters, GR32_System;
+{ TMainForm }
+
procedure TMainForm.FormCreate(Sender: TObject);
procedure LoadImage(Dst: TBitmap32; const Filename, AlphaFilename: String);
@@ -397,8 +398,4 @@
initialization
DecimalSeparator := '.';
-{$IFDEF FPC}
- {$I MainUnit.lrs}
-{$ENDIF}
-
end.
Modified: trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.lpi
===================================================================
--- trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.lpi 2012-03-29 08:19:40 UTC (rev 1524)
+++ trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.lpi 2012-03-29 18:26:50 UTC (rev 1525)
@@ -1,23 +1,66 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <Version Value="7"/>
+ <Version Value="9"/>
+ <PathDelim Value="\"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>
</Flags>
+ <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
- <TargetFileExt Value=""/>
<Title Value="Sprites Example"/>
- <ActiveEditorIndexAtStart Value="3"/>
+ <ResourceType Value="res"/>
+ <Icon Value="0"/>
</General>
<VersionInfo>
- <ProjectVersion Value=""/>
<Language Value=""/>
<CharSet Value=""/>
+ <StringTable ProductVersion=""/>
</VersionInfo>
+ <BuildModes Count="2">
+ <Item1 Name="Debug" Default="True"/>
+ <Item2 Name="Release">
+ <CompilerOptions>
+ <Version Value="11"/>
+ <SearchPaths>
+ <IncludeFiles Value="../../../.."/>
+ <Libraries Value="../../../../Packages/lib/$(TargetCPU)-$(TargetOS)"/>
+ <OtherUnitFiles Value="../../../.."/>
+ <UnitOutputDirectory Value="$(TargetCPU)-$(TargetOS)"/>
+ </SearchPaths>
+ <Parsing>
+ <SyntaxOptions>
+ <CStyleOperator Value="False"/>
+ <IncludeAssertionCode Value="True"/>
+ <CPPInline Value="False"/>
+ <UseAnsiStrings Value="False"/>
+ </SyntaxOptions>
+ </Parsing>
+ <CodeGeneration>
+ <SmartLinkUnit Value="True"/>
+ </CodeGeneration>
+ <Linking>
+ <Debugging>
+ <GenerateDebugInfo Value="False"/>
+ </Debugging>
+ <LinkSmart Value="True"/>
+ <Options>
+ <LinkerOptions Value="-framework carbon"/>
+ <Win32>
+ <GraphicApplication Value="True"/>
+ </Win32>
+ </Options>
+ </Linking>
+ <Other>
+ <CompilerPath Value="$(CompPath)"/>
+ </Other>
+ </CompilerOptions>
+ </Item2>
+ </BuildModes>
<PublishOptions>
<Version Value="2"/>
+ <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
<IgnoreBinaries Value="False"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
@@ -25,7 +68,7 @@
<RunParams>
<local>
<FormatVersion Value="1"/>
- <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+ <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<RequiredPackages Count="3">
@@ -39,15 +82,10 @@
<PackageName Value="GR32_L"/>
</Item3>
</RequiredPackages>
- <Units Count="17">
+ <Units Count="2">
<Unit0>
<Filename Value="Sprites_Ex.lpr"/>
<IsPartOfProject Value="True"/>
- <CursorPos X="1" Y="12"/>
- <TopLine Value="1"/>
- <EditorIndex Value="0"/>
- <UsageCount Value="23"/>
- <Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="MainUnit.pas"/>
@@ -56,188 +94,29 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="MainUnit"/>
- <CursorPos X="52" Y="28"/>
- <TopLine Value="1"/>
- <EditorIndex Value="2"/>
- <UsageCount Value="23"/>
- <Loaded Value="True"/>
</Unit1>
- <Unit2>
- <Filename Value="MainUnit.lfm"/>
- <CursorPos X="1" Y="1"/>
- <TopLine Value="1"/>
- <EditorIndex Value="1"/>
- <UsageCount Value="11"/>
- <Loaded Value="True"/>
- <SyntaxHighlighter Value="LFM"/>
- </Unit2>
- <Unit3>
- <Filename Value="../../../../Packages/GR32_L.pas"/>
- <UnitName Value="GR32_L"/>
- <CursorPos X="1" Y="1"/>
- <TopLine Value="1"/>
- <UsageCount Value="10"/>
- </Unit3>
- <Unit4>
- <Filename Value="../../General/Rotate_Ex/MainUnit.pas"/>
- <ComponentName Value="Form1"/>
- <HasResources Value="True"/>
- <UnitName Value="MainUnit"/>
- <CursorPos X="27" Y="88"/>
- <TopLine Value="74"/>
- <UsageCount Value="10"/>
- </Unit4>
- <Unit5>
- <Filename Value="../ImgView_Layers_Ex/NewImageUnit.pas"/>
- <ComponentName Value="NewImageForm"/>
- <HasResources Value="True"/>
- <UnitName Value="NewImageUnit"/>
- <CursorPos X="1" Y="1"/>
- <TopLine Value="36"/>
- <UsageCount Value="10"/>
- </Unit5>
- <Unit6>
- <Filename Value="../RotLayer_Ex/MainUnit.pas"/>
- <ComponentName Value="Form1"/>
- <HasResources Value="True"/>
- <UnitName Value="MainUnit"/>
- <CursorPos X="11" Y="195"/>
- <TopLine Value="190"/>
- <UsageCount Value="10"/>
- </Unit6>
- <Unit7>
- <Filename Value="../../../../GR32.pas"/>
- <UnitName Value="GR32"/>
- <CursorPos X="14" Y="263"/>
- <TopLine Value="26"/>
- <UsageCount Value="11"/>
- </Unit7>
- <Unit8>
- <Filename Value="../../../../../fpc/rtl/inc/systemh.inc"/>
- <CursorPos X="11" Y="468"/>
- <TopLine Value="454"/>
- <UsageCount Value="10"/>
- </Unit8>
- <Unit9>
- <Filename Value="../../../../GR32_Image.pas"/>
- <UnitName Value="GR32_Image"/>
- <CursorPos X="17" Y="563"/>
- <TopLine Value="320"/>
- <UsageCount Value="11"/>
- </Unit9>
- <Unit10>
- <Filename Value="MainUnit.lfm.bak"/>
- <CursorPos X="7" Y="26"/>
- <TopLine Value="101"/>
- <UsageCount Value="10"/>
- <SyntaxHighlighter Value="None"/>
- </Unit10>
- <Unit11>
- <Filename Value="temp.lfm"/>
- <CursorPos X="10" Y="53"/>
- <TopLine Value="44"/>
- <UsageCount Value="10"/>
- <SyntaxHighlighter Value="LFM"/>
- </Unit11>
- <Unit12>
- <Filename Value="../../Resampling/NestedSampling_Ex/MainUnit.pas"/>
- <UnitName Value="MainUnit"/>
- <CursorPos X="13" Y="74"/>
- <TopLine Value="76"/>
- <UsageCount Value="10"/>
- </Unit12>
- <Unit13>
- <Filename Value="../../Resampling/PixelF_Ex/MainUnit.pas"/>
- <HasResources Value="True"/>
- <UnitName Value="MainUnit"/>
- <CursorPos X="24" Y="15"/>
- <TopLine Value="18"/>
- <UsageCount Value="10"/>
- </Unit13>
- <Unit14>
- <Filename Value="../../Resampling/PixelF_Ex/MainUnit.lfm"/>
- <CursorPos X="1" Y="1"/>
- <TopLine Value="1"/>
- <UsageCount Value="10"/>
- <SyntaxHighlighter Value="LFM"/>
- </Unit14>
- <Unit15>
- <Filename Value="../../../../GR32_DrawingEx.pas"/>
- <UnitName Value="GR32_DrawingEx"/>
- <CursorPos X="3" Y="27"/>
- <TopLine Value="1"/>
- <UsageCount Value="10"/>
- </Unit15>
- <Unit16>
- <Filename Value="../../../../../../../../Lazarus/lcl/include/control.inc"/>
- <CursorPos X="1" Y="344"/>
- <TopLine Value="327"/>
- <EditorIndex Value="3"/>
- <UsageCount Value="10"/>
- <Loaded Value="True"/>
- </Unit16>
</Units>
- <JumpHistory Count="9" HistoryIndex="8">
- <Position1>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="106" Column="8" TopLine="80"/>
- </Position1>
- <Position2>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="106" Column="8" TopLine="80"/>
- </Position2>
- <Position3>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="125" Column="19" TopLine="143"/>
- </Position3>
- <Position4>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="124" Column="19" TopLine="124"/>
- </Position4>
- <Position5>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="159" Column="18" TopLine="135"/>
- </Position5>
- <Position6>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="149" Column="1" TopLine="138"/>
- </Position6>
- <Position7>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="98" Column="1" TopLine="87"/>
- </Position7>
- <Position8>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="96" Column="41" TopLine="77"/>
- </Position8>
- <Position9>
- <Filename Value="MainUnit.pas"/>
- <Caret Line="28" Column="52" TopLine="1"/>
- </Position9>
- </JumpHistory>
</ProjectOptions>
<CompilerOptions>
- <Version Value="8"/>
+ <Version Value="11"/>
<SearchPaths>
- <IncludeFiles Value="../../../../"/>
- <Libraries Value="../../../../Packages/lib/$(TargetCPU)-$(TargetOS)/"/>
- <OtherUnitFiles Value="../../../../"/>
- <UnitOutputDirectory Value="$(TargetCPU)-$(TargetOS)/"/>
+ <IncludeFiles Value="../../../.."/>
+ <Libraries Value="../../../../Packages/lib/$(TargetCPU)-$(TargetOS)"/>
+ <OtherUnitFiles Value="../../../.."/>
+ <UnitOutputDirectory Value="$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
<CStyleOperator Value="False"/>
<IncludeAssertionCode Value="True"/>
<CPPInline Value="False"/>
+ <UseAnsiStrings Value="False"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
</CodeGeneration>
<Linking>
- <Debugging>
- <GenerateDebugInfo Value="True"/>
- </Debugging>
<LinkSmart Value="True"/>
<Options>
<LinkerOptions Value="-framework carbon"/>
@@ -251,12 +130,6 @@
</Other>
</CompilerOptions>
<Debugging>
- <BreakPoints Count="1">
- <Item1>
- <Source Value="../../../../../lazarus/lcl/include/control.inc"/>
- <Line Value="344"/>
- </Item1>
- </BreakPoints>
<Exceptions Count="2">
<Item1>
<Name Value="ECodetoolError"/>
Modified: trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.lpr
===================================================================
--- trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.lpr 2012-03-29 08:19:40 UTC (rev 1524)
+++ trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.lpr 2012-03-29 18:26:50 UTC (rev 1525)
@@ -6,8 +6,10 @@
ImagesForLazarus,
MainUnit in 'MainUnit.pas' {Form1};
+{$R *.res}
+
begin
- Application.Title:='Sprites Example';
+ Application.Title := 'Sprites Example';
Application.Initialize;
Application.CreateForm(TMainForm, MainForm);
Application.Run;
Modified: trunk/Source/Examples/Vcl/Layers/Sprites_Ex/Sprites_Ex.res
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|