Changeset 523

Timestamp:

Apr 17, 2019, 11:18:41 AM (6 years ago)

Author:

chronos

Message:

• Added: Win32 installer for GraphicTest.

Location:

GraphicTest

Files:

• GraphicTest.lpi (modified) (2 diffs)
• Install (added)
• Install/win (added)
• Install/win/GraphicTest.iss (added)
• Install/win/build.bat (added)
• Packages/Graphics32/GR32_BlendASM.pas (modified) (1 diff)
• Packages/Graphics32/GR32_BlendMMX.pas (modified) (1 diff)
• Packages/Graphics32/Packages/GR32_Lazarus.lpk (modified) (1 diff)

GraphicTest/GraphicTest.lpi

@@ -56 +56 @@
               <IgnoredMessages idx5024="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-dopengl
--dGRAPHICS32"/>
+            <CustomOptions Value="-dOPENGL"/>
           </Other>
         </CompilerOptions>
       </Item2>
       <SharedMatrixOptions Count="2">
-        <Item1 ID="838068306737" Targets="GR32_L, bgrabitmappack" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
-        <Item2 ID="108912769980" Targets="GR32_L, bgrabitmappack" Modes="Release" Value="-CX -XX -O3"/>
+        <Item1 ID="838068306737" Targets="GR32_Lazarus, bgrabitmappack" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
+        <Item2 ID="108912769980" Targets="GR32_Lazarus, bgrabitmappack" Modes="Release" Value="-CX -XX -O3"/>
       </SharedMatrixOptions>
     </BuildModes>
@@ -222 +221 @@
         <IgnoredMessages idx5024="True"/>
       </CompilerMessages>
-      <CustomOptions Value="-dOPENGL -dGRAPHICS32"/>
+      <CustomOptions Value="-dOPENGL"/>
     </Other>
   </CompilerOptions>

GraphicTest/Packages/Graphics32/GR32_BlendASM.pas

@@ -56 +56 @@
 
 {$IFDEF TARGET_x86}
-function MergeReg_ASM(F, B: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
+function MergeReg_ASM(F, B: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
 {$ENDIF}
 

GraphicTest/Packages/Graphics32/GR32_BlendMMX.pas

@@ -43 +43 @@
 
 {$IFNDEF OMIT_MMX}
-function BlendReg_MMX(F, B: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-procedure BlendMem_MMX(F: TColor32; var B: TColor32); {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-
-function BlendRegEx_MMX(F, B, M: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-procedure BlendMemEx_MMX(F: TColor32; var B:TColor32; M: TColor32); {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-
-function BlendRegRGB_MMX(F, B, W: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-procedure BlendMemRGB_MMX(F: TColor32; var B: TColor32; W: TColor32); {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-
-procedure BlendLine_MMX(Src, Dst: PColor32; Count: Integer); {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-procedure BlendLineEx_MMX(Src, Dst: PColor32; Count: Integer; M: TColor32); {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-
-function CombineReg_MMX(X, Y, W: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-procedure CombineMem_MMX(F: TColor32; var B: TColor32; W: TColor32); {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-procedure CombineLine_MMX(Src, Dst: PColor32; Count: Integer; W: TColor32); {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-
-procedure EMMS_MMX; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-
-function LightenReg_MMX(C: TColor32; Amount: Integer): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-
-function ColorAdd_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-function ColorSub_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-function ColorModulate_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-function ColorMax_EMMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-function ColorMin_EMMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-function ColorDifference_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-function ColorExclusion_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
-function ColorScale_MMX(C, W: TColor32): TColor32; {$IFDEF FPC} assembler; nostackframe; {$ENDIF}
+function BlendReg_MMX(F, B: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+procedure BlendMem_MMX(F: TColor32; var B: TColor32); {$IFDEF FPC} assembler; {$ENDIF}
+
+function BlendRegEx_MMX(F, B, M: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+procedure BlendMemEx_MMX(F: TColor32; var B:TColor32; M: TColor32); {$IFDEF FPC} assembler; {$ENDIF}
+
+function BlendRegRGB_MMX(F, B, W: TColor32): TColor32; {$IFDEF FPC} assembler;{$ENDIF}
+procedure BlendMemRGB_MMX(F: TColor32; var B: TColor32; W: TColor32); {$IFDEF FPC} assembler; {$ENDIF}
+
+procedure BlendLine_MMX(Src, Dst: PColor32; Count: Integer); {$IFDEF FPC} assembler; {$ENDIF}
+procedure BlendLineEx_MMX(Src, Dst: PColor32; Count: Integer; M: TColor32); {$IFDEF FPC} assembler; {$ENDIF}
+
+function CombineReg_MMX(X, Y, W: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+procedure CombineMem_MMX(F: TColor32; var B: TColor32; W: TColor32); {$IFDEF FPC} assembler; {$ENDIF}
+procedure CombineLine_MMX(Src, Dst: PColor32; Count: Integer; W: TColor32); {$IFDEF FPC} assembler; {$ENDIF}
+
+procedure EMMS_MMX; {$IFDEF FPC} assembler; {$ENDIF}
+
+function LightenReg_MMX(C: TColor32; Amount: Integer): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+
+function ColorAdd_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+function ColorSub_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+function ColorModulate_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+function ColorMax_EMMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+function ColorMin_EMMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+function ColorDifference_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+function ColorExclusion_MMX(C1, C2: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
+function ColorScale_MMX(C, W: TColor32): TColor32; {$IFDEF FPC} assembler; {$ENDIF}
 {$ENDIF}
 

GraphicTest/Packages/Graphics32/Packages/GR32_Lazarus.lpk

@@ -9 +9 @@
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value=".."/>
         <OtherUnitFiles Value=".."/>
-        <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)\$(LCLWidgetType)"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
       </SearchPaths>
       <Parsing>