Patch level : 12.0 nopatch

Files correlati : Commento: sistemazione progetti
2023-03-03 20:31:57 +01:00 · 2023-03-03 20:31:57 +01:00 · bf9fc8bb42
commit bf9fc8bb42
parent 82df14b573
40 changed files with 319 additions and 659 deletions
--- a/build/Or1.vcxproj
+++ b/build/Or1.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -77,7 +77,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -119,7 +119,6 @@
      <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@ -159,7 +158,6 @@
    </Xdcmake>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cg\cglib02.cpp" />
    <ClCompile Include="..\src\or\or1.cpp">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -245,9 +243,15 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
    <ProjectReference Include="vedocext.vcxproj">
      <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/Sc0.vcxproj
+++ b/build/Sc0.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -106,7 +106,8 @@
      <ResourceOutputFileName>$(IntDir)</ResourceOutputFileName>
    </ManifestResourceCompile>
    <PostBuildEvent>
-      <Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
+      <Command>
      </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -220,6 +221,7 @@
    <ClInclude Include="..\src\sc\sc0100p.h" />
    <ClInclude Include="..\src\sc\sc0200b.h" />
    <ClInclude Include="..\src\sc\sc0300a.h" />
    <ClInclude Include="..\src\sc\scselect.h" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="AgaLib.vcxproj">
--- a/build/Sc1.vcxproj
+++ b/build/Sc1.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -150,7 +150,8 @@
      <OutputFile>.\..\release/Sc1.bsc</OutputFile>
    </Bscmake>
    <PostBuildEvent>
-      <Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
+      <Command>
      </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/build/Sc2.vcxproj
+++ b/build/Sc2.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -145,7 +145,8 @@
      <OutputFile>.\..\release/Sc2.bsc</OutputFile>
    </Bscmake>
    <PostBuildEvent>
-      <Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
+      <Command>
      </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/build/Sc3.vcxproj
+++ b/build/Sc3.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -140,7 +140,8 @@
      <OutputFile>.\..\release/Sc3.bsc</OutputFile>
    </Bscmake>
    <PostBuildEvent>
-      <Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
+      <Command>
      </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/build/at0.vcxproj
+++ b/build/at0.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -358,301 +358,6 @@
    <ClInclude Include="..\src\at\at0800.h" />
    <ClInclude Include="..\src\at\at0800a.h" />
  </ItemGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\at\f115.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f116.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f121.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f128.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f129.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f130.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f131.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f90.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f91.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f92.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f93.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f94.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f95.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f96.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f97.trr">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying trr %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).trr;%(Outputs)</Outputs>
    </CustomBuild>
  </ItemGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\at\f115.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f116.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f121.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f128.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f129.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f130.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f131.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f90.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f91.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f92.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f93.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f94.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f95.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\at\f96.dir">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying dir %(FullPath)...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)recdesc\%(Filename).dir;%(Outputs)</Outputs>
    </CustomBuild>
    <DirCompiler Include="..\src\at\f97.dir" />
  </ItemGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\at\agaat.men">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying men %(FullPath)...</Message>
--- a/build/ca0.vcxproj
+++ b/build/ca0.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -239,32 +239,6 @@
    <ClInclude Include="..\src\ca\catbtpc.h" />
    <ClInclude Include="..\src\ca\catbtpl.h" />
  </ItemGroup>
  <ItemGroup>
    <TrrCompiler Include="..\src\ca\f106.trr" />
    <TrrCompiler Include="..\src\ca\f107.trr" />
    <TrrCompiler Include="..\src\ca\f108.trr" />
    <TrrCompiler Include="..\src\ca\f146.trr" />
    <TrrCompiler Include="..\src\ca\f147.trr" />
    <TrrCompiler Include="..\src\ca\f148.trr" />
    <TrrCompiler Include="..\src\ca\f149.trr" />
    <TrrCompiler Include="..\src\ca\f150.trr" />
    <TrrCompiler Include="..\src\ca\f151.trr" />
    <TrrCompiler Include="..\src\ca\f155.trr" />
    <TrrCompiler Include="..\src\ca\f172.trr" />
  </ItemGroup>
  <ItemGroup>
    <DirCompiler Include="..\src\ca\f106.dir" />
    <DirCompiler Include="..\src\ca\f107.dir" />
    <DirCompiler Include="..\src\ca\f108.dir" />
    <DirCompiler Include="..\src\ca\f146.dir" />
    <DirCompiler Include="..\src\ca\f147.dir" />
    <DirCompiler Include="..\src\ca\f148.dir" />
    <DirCompiler Include="..\src\ca\f149.dir" />
    <DirCompiler Include="..\src\ca\f150.dir" />
    <DirCompiler Include="..\src\ca\f151.dir" />
    <DirCompiler Include="..\src\ca\f155.dir" />
    <DirCompiler Include="..\src\ca\f172.dir" />
  </ItemGroup>
  <ItemGroup>
    <MenCompiler Include="..\src\ca\cacmmenu.men" />
    <MenCompiler Include="..\src\ca\camenu.men" />
--- a/build/fd.vcxproj
+++ b/build/fd.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -62,12 +62,11 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\src\xvaga\;..\wx28X\lib\vc_dll\mswd\;..\wx28X\include\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\xvaga;;..\libraries\wx28X\lib\vc_dll\msw\;..\libraries\wx28X\include\;..\libraries\wxPG\propgrid\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>false</MinimalRebuild>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@ -75,7 +74,7 @@
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\wx28X\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Manifest />
  </ItemDefinitionGroup>
@ -86,7 +85,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\src\xvaga;..\wx28X\lib\vc_dll\msw\;..\wx28X\include\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\xvaga;;..\libraries\wx28X\lib\vc_dll\msw\;..\libraries\wx28X\include\;..\libraries\wxPG\propgrid\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
@ -96,7 +95,7 @@
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\wx28X\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
@ -104,40 +103,40 @@
  </ItemGroup>
  <ItemGroup>
    <Library Include="..\lib\SSADll.lib" />
-    <Library Include="..\wx28X\lib\vc_dll\wxbase28.lib">
+    <Library Include="..\libraries\\wx28X\lib\vc_dll\wxbase28.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxbase28d.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxbase28d.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxbase28d_net.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxbase28d_net.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxbase28d_xml.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxbase28d_xml.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxbase28_net.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxbase28_net.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxbase28_xml.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxbase28_xml.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxmsw28d_adv.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxmsw28d_adv.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxmsw28d_aui.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxmsw28d_aui.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxmsw28d_core.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxmsw28d_core.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxmsw28_adv.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxmsw28_adv.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxmsw28_aui.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxmsw28_aui.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
-    <Library Include="..\wx28X\lib\vc_dll\wxmsw28_core.lib">
+    <Library Include="..\libraries\wx28X\lib\vc_dll\wxmsw28_core.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
  </ItemGroup>
--- a/build/gv.sln
+++ b/build/gv.sln
@ -1,10 +1,14 @@
-
+
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2010
+# Visual Studio 15
 VisualStudioVersion = 15.0.33403.129
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gv0", "gv0.vcxproj", "{9F10033D-A054-43E6-8449-F6EC63813400}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -19,8 +23,15 @@ Global
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {12F71982-EDF3-4465-9069-2C58C9BF328D}
 	EndGlobalSection
 EndGlobal
--- a/build/gv0.vcxproj
+++ b/build/gv0.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{9F10033D-A054-43E6-8449-F6EC63813400}</ProjectGuid>
    <RootNamespace>gv0</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -73,7 +76,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -117,7 +120,6 @@
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@ -126,7 +128,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\..\wx289\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -169,12 +171,6 @@
    <DirCompiler Include="..\src\gv\f158.dir" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cg\cg2101.cpp" />
    <ClCompile Include="..\src\cg\cg2103.cpp" />
    <ClCompile Include="..\src\cg\cglib01.cpp" />
    <ClCompile Include="..\src\cg\cglib02.cpp" />
    <ClCompile Include="..\src\cg\cglib03.cpp" />
    <ClCompile Include="..\src\cg\cgsaldac.cpp" />
    <ClCompile Include="..\src\gv\gv0.cpp">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -187,12 +183,7 @@
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
-    <ClCompile Include="..\src\gv\gv0600.cpp">
+    <ClCompile Include="..\src\gv\gv0600.cpp" />
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <ClCompile Include="..\src\gv\gvlib.cpp">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -226,6 +217,9 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <PngCompiler Include="..\src\gv\F24.png" />
--- a/build/ha.sln
+++ b/build/ha.sln
@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ha0", "ha0.vcxproj", "{2DB7F8EF-BABB-4A27-BC7D-8821B0D285C6}"
@ -19,6 +19,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -61,8 +67,23 @@ Global
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32
 		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32
 		{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {34D84CC1-F494-44BF-AFC1-2A66E84CB2D8}
 	EndGlobalSection
 EndGlobal
--- a/build/ha0.vcxproj
+++ b/build/ha0.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{2DB7F8EF-BABB-4A27-BC7D-8821B0D285C6}</ProjectGuid>
    <RootNamespace>lv0</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -79,7 +82,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -118,7 +121,6 @@
      <AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)\</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -127,7 +129,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -177,7 +179,6 @@
    <TxtCompiler Include="..\src\ha\hatabcom.txt" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cg\cglib01.cpp" />
    <ClCompile Include="..\src\ha\ha0.cpp" />
    <ClCompile Include="..\src\ha\ha0100.cpp" />
    <ClCompile Include="..\src\ha\ha0200.cpp" />
@ -223,6 +224,9 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
--- a/build/ha1.vcxproj
+++ b/build/ha1.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{5C6DF9DD-C3A6-4562-8699-10E0B0FB4DC9}</ProjectGuid>
    <RootNamespace>ha1</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -68,7 +71,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -77,7 +79,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -122,7 +124,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -141,10 +143,6 @@
    </Bscmake>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cg\cg2101.cpp" />
    <ClCompile Include="..\src\cg\cg2103.cpp" />
    <ClCompile Include="..\src\cg\cglib03.cpp" />
    <ClCompile Include="..\src\cg\cgsaldac.cpp" />
    <ClCompile Include="..\src\ha\ha1.cpp" />
    <ClCompile Include="..\src\ha\ha1100.cpp" />
    <ClCompile Include="..\src\ha\ha1200.cpp" />
@ -191,6 +189,9 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
--- a/build/ha2.vcxproj
+++ b/build/ha2.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{9A321567-FAE8-4FC3-A257-B9E35E0736B9}</ProjectGuid>
    <RootNamespace>lv0</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -79,7 +82,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -121,7 +124,6 @@
      <AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)\</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -130,7 +132,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\..\wx2811\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -201,9 +203,15 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="fplib.vcxproj">
      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
    <ProjectReference Include="vedocext.vcxproj">
      <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/ha3.vcxproj
+++ b/build/ha3.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{6AE44AC2-D05F-4754-ACB2-6FC24F3800BB}</ProjectGuid>
    <RootNamespace>lv0</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -79,7 +82,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -121,7 +124,6 @@
      <AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)\</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -130,7 +132,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -210,36 +212,22 @@
    <RepCompiler Include="..\src\ha\hagiri.rep" />
    <RepCompiler Include="..\src\ha\hastatt.rep" />
  </ItemGroup>
  <ItemGroup>
    <Library Include="..\lib\AgaLib.lib">
      <FileType>Document</FileType>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
    <Library Include="..\lib\AgaLibd.lib">
      <FileType>Document</FileType>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
    <Library Include="..\lib\vedoc.lib">
      <FileType>Document</FileType>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
    <Library Include="..\lib\vedocd.lib">
      <FileType>Document</FileType>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
    <Library Include="..\lib\vedocext.lib">
      <FileType>Document</FileType>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
    <Library Include="..\lib\vedocextd.lib">
      <FileType>Document</FileType>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="lilib.vcxproj">
      <Project>{b61f0ad4-0cce-4371-8e92-85a26caf1a7c}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
    <ProjectReference Include="vedocext.vcxproj">
      <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/ha3.vcxproj.filters
+++ b/build/ha3.vcxproj.filters
@ -73,9 +73,6 @@
    <Filter Include="Reports">
      <UniqueIdentifier>{9b1b500c-a736-44cc-ac06-8de27d20f582}</UniqueIdentifier>
    </Filter>
    <Filter Include="Libraries">
      <UniqueIdentifier>{67ec6a05-4693-4c55-a26a-0e16117eeb8d}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <RepCompiler Include="..\src\ha\ha3700a.rep">
@ -88,24 +85,4 @@
      <Filter>Reports</Filter>
    </RepCompiler>
  </ItemGroup>
  <ItemGroup>
    <Library Include="..\lib\AgaLib.lib">
      <Filter>Libraries</Filter>
    </Library>
    <Library Include="..\lib\AgaLibd.lib">
      <Filter>Libraries</Filter>
    </Library>
    <Library Include="..\lib\vedoc.lib">
      <Filter>Libraries</Filter>
    </Library>
    <Library Include="..\lib\vedocd.lib">
      <Filter>Libraries</Filter>
    </Library>
    <Library Include="..\lib\vedocext.lib">
      <Filter>Libraries</Filter>
    </Library>
    <Library Include="..\lib\vedocextd.lib">
      <Filter>Libraries</Filter>
    </Library>
  </ItemGroup>
 </Project>
--- a/build/ha_profiles.vcxproj
+++ b/build/ha_profiles.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -17,17 +17,20 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{50411897-4D04-4906-A9D6-67FF865B513D}</ProjectGuid>
    <RootNamespace>lv_profiles</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/build/hacnv.vcxproj
+++ b/build/hacnv.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{21311A14-C276-4CED-AED2-53793A599FA0}</ProjectGuid>
    <RootNamespace>lv0</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -76,7 +79,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -116,7 +119,6 @@
      <AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)\</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -124,7 +126,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\..\wx2811\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -170,20 +172,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </CustomBuildStep>
  </ItemGroup>
  <ItemGroup>
    <Library Include="..\lib\AgaLib.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
    <Library Include="..\lib\AgaLibD.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
    <Library Include="..\lib\vedoc.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    </Library>
    <Library Include="..\lib\vedocd.lib">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </Library>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="campo.rc">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -207,7 +195,6 @@
    <MskCompiler Include="..\src\ha\hacnv500a.uml" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cg\cgsaldac.cpp" />
    <ClCompile Include="..\src\ha\hacnv.cpp" />
    <ClCompile Include="..\src\ha\hacnv100.cpp" />
    <ClCompile Include="..\src\ha\hacnv200.cpp" />
@ -224,6 +211,15 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
    <ProjectReference Include="vedocext.vcxproj">
      <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/hacnv.vcxproj.filters
+++ b/build/hacnv.vcxproj.filters
@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <ClCompile Include="..\src\cg\cgsaldac.cpp">
      <Filter>Sources</Filter>
    </ClCompile>
    <ClCompile Include="..\src\ha\hacnv.cpp">
      <Filter>Sources</Filter>
    </ClCompile>
@ -55,20 +52,6 @@
  <ItemGroup>
    <ResourceCompile Include="campo.rc" />
  </ItemGroup>
  <ItemGroup>
    <Library Include="..\lib\AgaLib.lib">
      <Filter>Libraries</Filter>
    </Library>
    <Library Include="..\lib\AgaLibD.lib">
      <Filter>Libraries</Filter>
    </Library>
    <Library Include="..\lib\vedoc.lib">
      <Filter>Libraries</Filter>
    </Library>
    <Library Include="..\lib\vedocd.lib">
      <Filter>Libraries</Filter>
    </Library>
  </ItemGroup>
  <ItemGroup>
    <MskCompiler Include="..\src\ha\hacnv100a.uml">
      <Filter>Masks</Filter>
@ -97,8 +80,5 @@
      <UniqueIdentifier>{3305f646-3b52-43e2-bd36-18e754e42dda}</UniqueIdentifier>
      <Extensions>uml</Extensions>
    </Filter>
    <Filter Include="Libraries">
      <UniqueIdentifier>{5a39f4c8-89ee-47c9-b08a-c972968375f9}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
 </Project>
--- a/build/ic.sln
+++ b/build/ic.sln
@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ic0", "ic0.vcxproj", "{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}"
@ -23,4 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {829677FF-FAB2-4FD8-8370-28FC8239C213}
 	EndGlobalSection
 EndGlobal
--- a/build/ic0.vcxproj
+++ b/build/ic0.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -70,7 +70,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -126,7 +125,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
--- a/build/mr.sln
+++ b/build/mr.sln
@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr0", "mr0.vcxproj", "{92083925-A9A5-4539-95E2-39EA1511D912}"
@ -11,6 +11,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -37,8 +41,19 @@ Global
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F0EE82B6-D20C-40B3-AA2A-34F77E2D02E1}
 	EndGlobalSection
 EndGlobal
--- a/build/mr0.vcxproj
+++ b/build/mr0.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -120,7 +120,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -139,7 +139,8 @@
      <OutputFile>.\..\release/mr0.bsc</OutputFile>
    </Bscmake>
    <PostBuildEvent>
-      <Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
+      <Command>
      </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
@ -210,16 +211,6 @@
    <ClInclude Include="..\src\mr\mrtbimp.h" />
    <ClInclude Include="..\src\mr\mrtblnp.h" />
  </ItemGroup>
  <ItemGroup>
    <TrrCompiler Include="..\src\mr\f132.trr" />
    <TrrCompiler Include="..\src\mr\f152.trr" />
    <TrrCompiler Include="..\src\mr\f153.trr" />
  </ItemGroup>
  <ItemGroup>
    <DirCompiler Include="..\src\mr\f132.dir" />
    <DirCompiler Include="..\src\mr\f152.dir" />
    <DirCompiler Include="..\src\mr\f153.dir" />
  </ItemGroup>
  <ItemGroup>
    <IniCompiler Include="..\src\mr\mr0500a.ini" />
  </ItemGroup>
@ -260,6 +251,9 @@
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
    <ProjectReference Include="vedocext.vcxproj">
      <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/mr0.vcxproj.filters
+++ b/build/mr0.vcxproj.filters
@ -13,14 +13,6 @@
      <UniqueIdentifier>{612d6730-a29c-4740-84fe-16e51cbcb8fd}</UniqueIdentifier>
      <Extensions>h</Extensions>
    </Filter>
    <Filter Include="Trr">
      <UniqueIdentifier>{65bb3588-ceaf-46b5-96a1-75ee432bd582}</UniqueIdentifier>
      <Extensions>trr</Extensions>
    </Filter>
    <Filter Include="Dir">
      <UniqueIdentifier>{e2495c95-8717-45a7-88d0-7304732f7f54}</UniqueIdentifier>
      <Extensions>dir</Extensions>
    </Filter>
    <Filter Include="Ini">
      <UniqueIdentifier>{14d5e3e5-5452-4ecc-851a-c7fbb4af15a4}</UniqueIdentifier>
      <Extensions>ini</Extensions>
@ -119,28 +111,6 @@
      <Filter>Headers</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <TrrCompiler Include="..\src\mr\f132.trr">
      <Filter>Trr</Filter>
    </TrrCompiler>
    <TrrCompiler Include="..\src\mr\f152.trr">
      <Filter>Trr</Filter>
    </TrrCompiler>
    <TrrCompiler Include="..\src\mr\f153.trr">
      <Filter>Trr</Filter>
    </TrrCompiler>
  </ItemGroup>
  <ItemGroup>
    <DirCompiler Include="..\src\mr\f132.dir">
      <Filter>Dir</Filter>
    </DirCompiler>
    <DirCompiler Include="..\src\mr\f152.dir">
      <Filter>Dir</Filter>
    </DirCompiler>
    <DirCompiler Include="..\src\mr\f153.dir">
      <Filter>Dir</Filter>
    </DirCompiler>
  </ItemGroup>
  <ItemGroup>
    <IniCompiler Include="..\src\mr\mr0500a.ini">
      <Filter>Ini</Filter>
--- a/build/mr1.vcxproj
+++ b/build/mr1.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -75,7 +75,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -144,12 +144,6 @@
    </Bscmake>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cg\cgsaldac.cpp">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <ClCompile Include="..\src\mr\mr1.cpp">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -205,9 +199,15 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
    <ProjectReference Include="vedocext.vcxproj">
      <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/mr2.vcxproj
+++ b/build/mr2.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -123,7 +123,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -143,12 +143,6 @@
    </Bscmake>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cg\cgsaldac.cpp">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <ClCompile Include="..\src\mr\mr2.cpp">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -259,9 +253,15 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
    <ProjectReference Include="vedocext.vcxproj">
      <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/np.sln
+++ b/build/np.sln
@ -1,10 +1,12 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np0", "np0.vcxproj", "{3D726EFE-764B-4B24-A4ED-DCD41B9BB386}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -19,8 +21,15 @@ Global
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6F0CC896-A4EA-406D-8B5A-78B26B81969E}
 	EndGlobalSection
 EndGlobal
--- a/build/np0.vcxproj
+++ b/build/np0.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -100,7 +100,8 @@
      <OutputFile>$(IntDir)</OutputFile>
    </Xdcmake>
    <PostBuildEvent>
-      <Command>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)"</Command>
+      <Command>
      </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -123,7 +124,6 @@
      <AssemblerListingLocation>.\../debug/</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>.\../debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@ -214,8 +214,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\src\cg\cg2101.cpp" />
    <ClCompile Include="..\src\cg\cg2103.cpp" />
    <ClCompile Include="..\src\cg\cg3100.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@ -229,11 +227,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\src\cg\cg3601.cpp" />
    <ClCompile Include="..\src\cg\cglib01.cpp" />
    <ClCompile Include="..\src\cg\cglib02.cpp" />
    <ClCompile Include="..\src\cg\cglib03.cpp" />
    <ClCompile Include="..\src\cg\cgsalda3.cpp" />
    <ClCompile Include="..\src\cg\cgsaldac.cpp" />
    <ClCompile Include="..\src\np\np0.cpp" />
    <ClCompile Include="..\src\np\np0100.cpp" />
    <ClCompile Include="..\src\np\np0200.cpp" />
@ -249,6 +243,9 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/or.sln
+++ b/build/or.sln
@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Or1", "Or1.vcxproj", "{BBB4EEFA-F24B-4B6C-9632-D7F42283869D}"
@ -7,6 +7,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -25,8 +29,19 @@ Global
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32
 		{A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32
 		{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1950298D-2D81-41D3-9724-4324BC8CDAEF}
 	EndGlobalSection
 EndGlobal
--- a/build/pa.sln
+++ b/build/pa.sln
@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.757
@ -13,6 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -39,6 +41,10 @@ Global
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/pa0.vcxproj
+++ b/build/pa0.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -194,6 +194,9 @@
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="fplib.vcxproj">
      <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
--- a/build/pe0.vcxproj
+++ b/build/pe0.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -77,7 +77,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -124,7 +124,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -147,10 +147,6 @@
  <ItemGroup>
    <ClCompile Include="..\src\ca\calib01.cpp" />
    <ClCompile Include="..\src\ca\calib02.cpp" />
    <ClCompile Include="..\src\cg\cg2101.cpp" />
    <ClCompile Include="..\src\cg\cglib02.cpp" />
    <ClCompile Include="..\src\cg\cglib03.cpp" />
    <ClCompile Include="..\src\cg\cgsaldac.cpp" />
    <ClCompile Include="..\src\ef\ef0101.cpp" />
    <ClCompile Include="..\src\in\inlib01.cpp" />
    <ClCompile Include="..\src\li\lilib01.cpp" />
@ -197,6 +193,9 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
    <ProjectReference Include="vedoc.vcxproj">
      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
    </ProjectReference>
--- a/build/pe1.vcxproj
+++ b/build/pe1.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@ -80,7 +80,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -122,7 +122,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
--- a/build/pr0.vcxproj
+++ b/build/pr0.vcxproj
@ -221,16 +221,6 @@
    <ClInclude Include="..\src\pr\pr0800a.h" />
    <ClInclude Include="..\src\pr\prtbsua.h" />
  </ItemGroup>
  <ItemGroup>
    <TrrCompiler Include="..\src\pr\f122.trr" />
    <TrrCompiler Include="..\src\pr\f123.trr" />
    <TrrCompiler Include="..\src\pr\f124.trr" />
  </ItemGroup>
  <ItemGroup>
    <DirCompiler Include="..\src\pr\f122.dir" />
    <DirCompiler Include="..\src\pr\f123.dir" />
    <DirCompiler Include="..\src\pr\f124.dir" />
  </ItemGroup>
  <ItemGroup>
    <MenCompiler Include="..\src\pr\prmenu.men" />
  </ItemGroup>
--- a/build/pr0.vcxproj.filters
+++ b/build/pr0.vcxproj.filters
@ -13,14 +13,6 @@
      <UniqueIdentifier>{fd9ec001-7ba6-48eb-ad30-fb2415af4089}</UniqueIdentifier>
      <Extensions>h</Extensions>
    </Filter>
    <Filter Include="Trr">
      <UniqueIdentifier>{39701b64-cae4-4192-96b1-bb8d1e6ef587}</UniqueIdentifier>
      <Extensions>trr</Extensions>
    </Filter>
    <Filter Include="Dir">
      <UniqueIdentifier>{eace73aa-fca7-4c15-91d6-fce0057ee454}</UniqueIdentifier>
      <Extensions>dir</Extensions>
    </Filter>
    <Filter Include="Men">
      <UniqueIdentifier>{af898b1a-45b5-4e56-875b-121640ad601c}</UniqueIdentifier>
      <Extensions>men</Extensions>
@ -114,28 +106,6 @@
      <Filter>Headers</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <TrrCompiler Include="..\src\pr\f122.trr">
      <Filter>Trr</Filter>
    </TrrCompiler>
    <TrrCompiler Include="..\src\pr\f123.trr">
      <Filter>Trr</Filter>
    </TrrCompiler>
    <TrrCompiler Include="..\src\pr\f124.trr">
      <Filter>Trr</Filter>
    </TrrCompiler>
  </ItemGroup>
  <ItemGroup>
    <DirCompiler Include="..\src\pr\f122.dir">
      <Filter>Dir</Filter>
    </DirCompiler>
    <DirCompiler Include="..\src\pr\f123.dir">
      <Filter>Dir</Filter>
    </DirCompiler>
    <DirCompiler Include="..\src\pr\f124.dir">
      <Filter>Dir</Filter>
    </DirCompiler>
  </ItemGroup>
  <ItemGroup>
    <MenCompiler Include="..\src\pr\prmenu.men">
      <Filter>Men</Filter>
--- a/build/ri.sln
+++ b/build/ri.sln
@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ri0", "ri0.vcxproj", "{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}"
@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ri1", "ri1.vcxproj", "{53A5
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -25,8 +27,15 @@ Global
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32
 		{2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
 		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9A60D5FE-67B9-4B58-A90A-63016FC1D3AF}
 	EndGlobalSection
 EndGlobal
--- a/build/ri0.vcxproj
+++ b/build/ri0.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}</ProjectGuid>
    <RootNamespace>ri0</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -69,7 +72,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -78,7 +80,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -123,7 +125,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -143,8 +145,6 @@
    </Bscmake>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cg\cglib01.cpp" />
    <ClCompile Include="..\src\cg\cglib02.cpp" />
    <ClCompile Include="..\src\ri\ri0.cpp" />
    <ClCompile Include="..\src\ri\ri0100.cpp" />
    <ClCompile Include="..\src\ri\ri0200.cpp" />
@ -185,6 +185,9 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/ri1.vcxproj
+++ b/build/ri1.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{53A55171-13C0-4BDE-8325-1186461B9EAA}</ProjectGuid>
    <RootNamespace>ri1</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -67,7 +70,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -76,7 +78,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -122,7 +124,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -144,8 +146,6 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\ba\ba8500.cpp" />
    <ClCompile Include="..\src\cg\cglib01.cpp" />
    <ClCompile Include="..\src\cg\cglib02.cpp" />
    <ClCompile Include="..\src\ri\ri1.cpp" />
    <ClCompile Include="..\src\ri\ri1100.cpp" />
    <ClCompile Include="..\src\ri\rilib01.cpp" />
@ -180,6 +180,9 @@
    <ProjectReference Include="AgaLib.vcxproj">
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
    <ProjectReference Include="cglib.vcxproj">
      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/sl.sln
+++ b/build/sl.sln
@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl0", "sl0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
@ -35,4 +35,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {19D332C0-6F58-426D-88A4-EDCE3E23E7A9}
 	EndGlobalSection
 EndGlobal
--- a/build/sl0.vcxproj
+++ b/build/sl0.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -13,15 +13,18 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}</ProjectGuid>
    <RootNamespace>sl0</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -65,7 +68,6 @@
      <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@ -75,7 +77,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@ -119,7 +121,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0410</Culture>
-      <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>