|
@@ -1,15 +1,15 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<CONFIG>
|
|
|
<ProjectOptions>
|
|
|
- <Version Value="11"/>
|
|
|
+ <Version Value="12"/>
|
|
|
<PathDelim Value="\"/>
|
|
|
<General>
|
|
|
<Flags>
|
|
|
<SaveClosedFiles Value="False"/>
|
|
|
<MainUnitHasUsesSectionForAllUnits Value="False"/>
|
|
|
+ <CompatibilityMode Value="True"/>
|
|
|
</Flags>
|
|
|
<SessionStorage Value="InProjectDir"/>
|
|
|
- <MainUnit Value="0"/>
|
|
|
<AutoCreateForms Value="False"/>
|
|
|
<Title Value="Double Commander"/>
|
|
|
<ResourceType Value="res"/>
|
|
@@ -38,7 +38,7 @@
|
|
|
</Target>
|
|
|
<SearchPaths>
|
|
|
<IncludeFiles Value="$(LazarusDir)\ide;$(ProjOutDir);..\sdk;..\units"/>
|
|
|
- <OtherUnitFiles Value="platform;platform\$(SrcOS);platform\$(SrcOS)\$(TargetOS);..\sdk;frames;fileviews;filesources;filesources\filesystem;filesources\multiarchive;filesources\multilist;filesources\searchresult;filesources\tempfilesystem;filesources\vfs;filesources\wcxarchive;filesources\wfxplugin;filesources\winnet;platform\unix\glib;platform\unix\mime;filesources\gio;rpc;rpc\sys\$(SrcOS);rpc\sys"/>
|
|
|
+ <OtherUnitFiles Value="platform;platform\$(SrcOS);platform\$(SrcOS)\$(TargetOS);..\sdk;frames;fileviews;filesources;filesources\filesystem;filesources\multiarchive;filesources\multilist;filesources\searchresult;filesources\tempfilesystem;filesources\vfs;filesources\wcxarchive;filesources\wfxplugin;filesources\winnet;platform\unix\glib;platform\unix\mime;filesources\gio;rpc;rpc\sys\$(SrcOS);rpc\sys;filesources\recyclebin"/>
|
|
|
<UnitOutputDirectory Value="..\units\$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
|
|
|
<SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType);$(fpcsrcdir)\packages\fcl-base\src"/>
|
|
|
</SearchPaths>
|
|
@@ -81,7 +81,7 @@
|
|
|
</Target>
|
|
|
<SearchPaths>
|
|
|
<IncludeFiles Value="$(LazarusDir)\ide;$(ProjOutDir);..\sdk;..\units"/>
|
|
|
- <OtherUnitFiles Value="platform;platform\$(SrcOS);platform\$(SrcOS)\$(TargetOS);..\sdk;frames;fileviews;filesources;filesources\filesystem;filesources\multiarchive;filesources\multilist;filesources\searchresult;filesources\tempfilesystem;filesources\vfs;filesources\wcxarchive;filesources\wfxplugin;filesources\winnet;platform\unix\glib;platform\unix\mime;filesources\gio;rpc;rpc\sys\$(SrcOS);rpc\sys"/>
|
|
|
+ <OtherUnitFiles Value="platform;platform\$(SrcOS);platform\$(SrcOS)\$(TargetOS);..\sdk;frames;fileviews;filesources;filesources\filesystem;filesources\multiarchive;filesources\multilist;filesources\searchresult;filesources\tempfilesystem;filesources\vfs;filesources\wcxarchive;filesources\wfxplugin;filesources\winnet;platform\unix\glib;platform\unix\mime;filesources\gio;rpc;rpc\sys\$(SrcOS);rpc\sys;filesources\recyclebin"/>
|
|
|
<UnitOutputDirectory Value="..\units\$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
|
|
|
<SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType);$(fpcsrcdir)\packages\fcl-base\src"/>
|
|
|
</SearchPaths>
|
|
@@ -120,29 +120,29 @@
|
|
|
</Target>
|
|
|
<SearchPaths>
|
|
|
<IncludeFiles Value="$(LazarusDir)\ide;$(ProjOutDir);..\sdk;..\units"/>
|
|
|
- <OtherUnitFiles Value="platform;platform\$(SrcOS);platform\$(SrcOS)\$(TargetOS);..\sdk;frames;fileviews;filesources;filesources\filesystem;filesources\multiarchive;filesources\multilist;filesources\searchresult;filesources\tempfilesystem;filesources\vfs;filesources\wcxarchive;filesources\wfxplugin;filesources\winnet;platform\unix\glib;platform\unix\mime;filesources\gio;rpc;rpc\sys\$(SrcOS);rpc\sys"/>
|
|
|
+ <OtherUnitFiles Value="platform;platform\$(SrcOS);platform\$(SrcOS)\$(TargetOS);..\sdk;frames;fileviews;filesources;filesources\filesystem;filesources\multiarchive;filesources\multilist;filesources\searchresult;filesources\tempfilesystem;filesources\vfs;filesources\wcxarchive;filesources\wfxplugin;filesources\winnet;platform\unix\glib;platform\unix\mime;filesources\gio;rpc;rpc\sys\$(SrcOS);rpc\sys;filesources\recyclebin"/>
|
|
|
<UnitOutputDirectory Value="..\units\$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
|
|
|
<SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType);$(fpcsrcdir)\packages\fcl-base\src"/>
|
|
|
</SearchPaths>
|
|
|
- <Conditionals Value="if (TargetOS = 'linux') then
|
|
|
+ <Conditionals Value="if (TargetOS = 'linux') then
|
|
|
begin
|
|
|
- LinkerOptions += ' -z relro --as-needed';
|
|
|
+ LinkerOptions += ' -z relro --as-needed';
|
|
|
end;
|
|
|
|
|
|
-if LCLWidgetType <> GetIDEValue('LCLWidgetType') then
|
|
|
+if LCLWidgetType <> GetIDEValue('LCLWidgetType') then
|
|
|
begin
|
|
|
- UnitPath += '$(FallbackOutputRoot)/LazControls/lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
|
|
|
- UnitPath += '$(FallbackOutputRoot)/SynEdit/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
|
|
|
+ UnitPath += '$(FallbackOutputRoot)/LazControls/lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
|
|
|
+ UnitPath += '$(FallbackOutputRoot)/SynEdit/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType);';
|
|
|
end;
|
|
|
|
|
|
-if ((LCLWidgetType = 'qt') or (LCLWidgetType = 'qt5')) and (TargetOS <> 'darwin') then
|
|
|
+if ((LCLWidgetType = 'qt') or (LCLWidgetType = 'qt5')) and (TargetOS <> 'darwin') then
|
|
|
begin
|
|
|
- UnitPath += 'platform/$(SrcOS)/qt5;';
|
|
|
+ UnitPath += 'platform/$(SrcOS)/qt5;';
|
|
|
end;
|
|
|
|
|
|
-if (LCLWidgetType = 'gtk2') and (SrcOS = 'unix') and (TargetOS <> 'darwin') then
|
|
|
+if (LCLWidgetType = 'gtk2') and (SrcOS = 'unix') and (TargetOS <> 'darwin') then
|
|
|
begin
|
|
|
- UnitPath += 'platform/$(SrcOS)/$(LCLWidgetType);';
|
|
|
+ UnitPath += 'platform/$(SrcOS)/$(LCLWidgetType);';
|
|
|
end;"/>
|
|
|
<Parsing>
|
|
|
<SyntaxOptions>
|
|
@@ -191,13 +191,13 @@ end;"/>
|
|
|
</PublishOptions>
|
|
|
<RunParams>
|
|
|
<local>
|
|
|
- <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>
|
|
|
<FormatVersion Value="2"/>
|
|
|
<Modes Count="1">
|
|
|
<Mode0 Name="default">
|
|
|
<local>
|
|
|
- <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>
|
|
|
</Mode0>
|
|
|
</Modes>
|
|
@@ -1128,6 +1128,7 @@ end;"/>
|
|
|
<Unit135>
|
|
|
<Filename Value="filesources\uvirtualfilesource.pas"/>
|
|
|
<IsPartOfProject Value="True"/>
|
|
|
+ <UnitName Value="uVirtualFileSource"/>
|
|
|
</Unit135>
|
|
|
<Unit136>
|
|
|
<Filename Value="filesources\filesystem\ffilesystemcopymoveoperationoptions.pas"/>
|
|
@@ -1901,13 +1902,13 @@ end;"/>
|
|
|
</Target>
|
|
|
<SearchPaths>
|
|
|
<IncludeFiles Value="$(LazarusDir)\ide;$(ProjOutDir);..\sdk;..\units"/>
|
|
|
- <OtherUnitFiles Value="platform;platform\$(SrcOS);platform\$(SrcOS)\$(TargetOS);..\sdk;frames;fileviews;filesources;filesources\filesystem;filesources\multiarchive;filesources\multilist;filesources\searchresult;filesources\tempfilesystem;filesources\vfs;filesources\wcxarchive;filesources\wfxplugin;filesources\winnet;platform\unix\glib;platform\unix\mime;filesources\gio;rpc;rpc\sys\$(SrcOS);rpc\sys"/>
|
|
|
+ <OtherUnitFiles Value="platform;platform\$(SrcOS);platform\$(SrcOS)\$(TargetOS);..\sdk;frames;fileviews;filesources;filesources\filesystem;filesources\multiarchive;filesources\multilist;filesources\searchresult;filesources\tempfilesystem;filesources\vfs;filesources\wcxarchive;filesources\wfxplugin;filesources\winnet;platform\unix\glib;platform\unix\mime;filesources\gio;rpc;rpc\sys\$(SrcOS);rpc\sys;filesources\recyclebin"/>
|
|
|
<UnitOutputDirectory Value="..\units\$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
|
|
|
<SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType);$(fpcsrcdir)\packages\fcl-base\src"/>
|
|
|
</SearchPaths>
|
|
|
- <Conditionals Value="if TargetOS = 'darwin' then begin
|
|
|
- UsageCustomOptions += ' -k-macosx_version_min -k10.5';
|
|
|
- UsageCustomOptions += ' -XR/Developer/SDKs/MacOSX10.5.sdk/';
|
|
|
+ <Conditionals Value="if TargetOS = 'darwin' then begin
|
|
|
+ UsageCustomOptions += ' -k-macosx_version_min -k10.5';
|
|
|
+ UsageCustomOptions += ' -XR/Developer/SDKs/MacOSX10.5.sdk/';
|
|
|
end;"/>
|
|
|
<Parsing>
|
|
|
<SyntaxOptions>
|