Merge remote-tracking branch 'remotes/origin/dev'

Author: mobius1qwe

pkg/Delphi/Engine/SaguiRAL.dproj

@@ -94,7 +94,7 @@
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <SanitizedProjectName>SaguiRAL</SanitizedProjectName>
         <DCC_Description>PascalRAL | Sagui Components</DCC_Description>
-        <DCC_UnitSearchPath>..\..\..\src\others\brookframework\source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>..\..\..\src\others;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
         <DCC_CBuilderOutput>None</DCC_CBuilderOutput>
@@ -175,6 +175,7 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_CBuilderOutput>None</DCC_CBuilderOutput>
+        <DCC_UnitSearchPath>..\..\..\src\others\;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>

pkg/Lazarus/Engine/saguiral.lpk

@@ -10,7 +10,7 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="..\..\..\src\engine\sagui;..\..\..\src\others\brookframework\Source"/>
+        <OtherUnitFiles Value="..\..\..\src\engine\sagui;..\..\..\src\others"/>
         <UnitOutputDirectory Value="..\..\..\compiled"/>
       </SearchPaths>
       <Other>