From 053b9c89c76cdb2fd23e7a77ad0bf52b51f8da6a Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 22 Dec 2016 05:41:02 +0000
Subject: [PATCH] RxFPC:fix compile after lazarus rev. 53751
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5555 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
components/rx/trunk/exsortsql.pas | 2 +-
components/rx/trunk/rx_sort_sqldb.lpk | 17 ++++-------------
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/components/rx/trunk/exsortsql.pas b/components/rx/trunk/exsortsql.pas
index 1d1e2f11f..47e4b4811 100644
--- a/components/rx/trunk/exsortsql.pas
+++ b/components/rx/trunk/exsortsql.pas
@@ -48,7 +48,7 @@ type
end;
implementation
-uses SQLDB, synRegExpr, strUtils;
+uses SQLDB, RegExpr, strUtils;
procedure TSQLQuerySortEngine.Sort(FieldName: string; ADataSet: TDataSet;
diff --git a/components/rx/trunk/rx_sort_sqldb.lpk b/components/rx/trunk/rx_sort_sqldb.lpk
index 8b1650672..b6f56bcb1 100644
--- a/components/rx/trunk/rx_sort_sqldb.lpk
+++ b/components/rx/trunk/rx_sort_sqldb.lpk
@@ -1,18 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<Package Version="4">
<Name Value="rx_sort_sqldb"/>
+ <Type Value="RunAndDesignTime"/>
<CompilerOptions>
<Version Value="11"/>
<SearchPaths>
- <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
+ <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
- <Other>
- <CompilerMessages>
- <MsgFileName Value=""/>
- </CompilerMessages>
- <CompilerPath Value="$(CompPath)"/>
- </Other>
</CompilerOptions>
<Version Major="1"/>
<Files Count="1">
@@ -22,17 +17,13 @@
<UnitName Value="RxSortSqlDB"/>
</Item1>
</Files>
- <Type Value="RunAndDesignTime"/>
- <RequiredPkgs Count="3">
+ <RequiredPkgs Count="2">
<Item1>
<PackageName Value="SQLDBLaz"/>
</Item1>
<Item2>
<PackageName Value="rxnew"/>
</Item2>
- <Item3>
- <PackageName Value="IDEIntf"/>
- </Item3>
</RequiredPkgs>
<UsageOptions>
<UnitPath Value="$(PkgOutDir)"/>