Patch level : 12.0 784

Files correlati : or1100a.msk Commento : Ricerca per ragione sociale cliente/fornitore nella stampa ordini
2019-05-07 14:55:14 +02:00 · 2019-05-07 14:55:14 +02:00 · 845142a3fb
commit 845142a3fb
parent 3b8c6ed067
207 changed files with 3626 additions and 2666 deletions
--- a/build/773mod.vcxproj
+++ b/build/773mod.vcxproj
@ -81,7 +81,7 @@
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\exed/773mod.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
--- a/build/Cg0.vcxproj
+++ b/build/Cg0.vcxproj
@ -233,7 +233,6 @@
    <MskCompiler Include="..\src\cg\cg0500a.uml" />
    <MskCompiler Include="..\src\cg\cg0700a.uml" />
    <MskCompiler Include="..\src\cg\cg0800a.uml" />
    <MskCompiler Include="..\src\cg\cg4300a.uml" />
  </ItemGroup>
  <ItemGroup>
    <TrrCompiler Include="..\src\cg\f103.trr" />
@ -290,6 +289,7 @@
    <ClInclude Include="..\src\cg\cg0500.h" />
    <ClInclude Include="..\src\cg\cg0700a.h" />
    <ClInclude Include="..\src\cg\cg0800a.h" />
    <ClInclude Include="..\src\cg\cglib05.h" />
    <ClInclude Include="..\src\cg\cgpim.h" />
  </ItemGroup>
  <ItemGroup>
@ -315,10 +315,11 @@
      <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup>
+<ItemGroup>
-    <RepCompiler Include="..\src\cg\cg0800a.rep" />
+    <RepCompiler Include="..\src\cg\cg0800a.rep">
-  </ItemGroup>
+      <SubType>Designer</SubType>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+    </RepCompiler>
  </ItemGroup>  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
    <Import Project="CampoRules.targets" />
  </ImportGroup>
--- a/build/Cg0.vcxproj.filters
+++ b/build/Cg0.vcxproj.filters
@ -98,9 +98,6 @@
    <MskCompiler Include="..\src\cg\cg0400b.uml">
      <Filter>Masks</Filter>
    </MskCompiler>
    <MskCompiler Include="..\src\cg\cg4300a.uml">
      <Filter>Masks</Filter>
    </MskCompiler>
    <MskCompiler Include="..\src\cg\cg0800a.uml">
      <Filter>Masks</Filter>
    </MskCompiler>
@ -263,6 +260,9 @@
    <ClInclude Include="..\src\cg\cg0800a.h">
      <Filter>Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\src\cg\cglib05.h">
      <Filter>Headers</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="campo.rc" />
--- a/build/Cg4.vcxproj
+++ b/build/Cg4.vcxproj
@ -118,7 +118,6 @@
      <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@ -332,6 +331,7 @@
    <ClInclude Include="..\src\cg\cg4900a.h" />
    <ClInclude Include="..\src\cg\cg4a00a.h" />
    <ClInclude Include="..\src\cg\cg4b00a.h" />
    <ClInclude Include="..\src\cg\cglib01.h" />
    <ClInclude Include="..\src\cg\cglib05.h" />
  </ItemGroup>
  <ItemGroup>
--- a/build/Cg4.vcxproj.filters
+++ b/build/Cg4.vcxproj.filters
@ -224,6 +224,9 @@
    <ClInclude Include="..\src\cg\cglib05.h">
      <Filter>Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\src\cg\cglib01.h">
      <Filter>Headers</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="campo.rc" />
--- a/build/Cg7.vcxproj
+++ b/build/Cg7.vcxproj
@ -68,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>
@ -160,6 +159,7 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\ba\ba8500.cpp" />
    <ClCompile Include="..\src\cg\cg2103.cpp" />
    <ClCompile Include="..\src\cg\cg7.cpp">
      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -183,6 +183,7 @@
    <ClCompile Include="..\src\cg\cgpim.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\cg\cg2103.h" />
    <ClInclude Include="..\src\cg\cg7400a.h" />
    <ClInclude Include="..\src\cg\cg5900a.h" />
    <ClInclude Include="..\src\cg\cg7.h" />
--- a/build/Cg7.vcxproj.filters
+++ b/build/Cg7.vcxproj.filters
@ -37,6 +37,9 @@
    <ClCompile Include="..\src\cg\cg7800.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\cg\cg2103.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\cg\cg7.h">
@ -63,6 +66,9 @@
    <ClInclude Include="..\src\cg\ivadiff.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\cg\cg2103.h">
      <Filter>Header Files</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="Source Files">
--- a/build/Cg7.vcxproj.user
+++ b/build/Cg7.vcxproj.user
@ -3,6 +3,6 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-6 -uADMIN</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-5 -uADMIN</LocalDebuggerCommandArguments>
  </PropertyGroup>
 </Project>
--- a/build/ca3.vcxproj
+++ b/build/ca3.vcxproj
@ -293,7 +293,9 @@
  </ItemGroup>
  <ItemGroup>
    <RepCompiler Include="..\src\ca\ca3100a.rep" />
-    <RepCompiler Include="..\src\ca\ca3100b.rep" />
+    <RepCompiler Include="..\src\ca\ca3100b.rep">
      <SubType>Designer</SubType>
    </RepCompiler>
    <RepCompiler Include="..\src\ca\ca3200a.rep" />
    <RepCompiler Include="..\src\ca\ca3200b.rep" />
    <RepCompiler Include="..\src\ca\ca3300a.rep" />
@ -302,9 +304,15 @@
    <RepCompiler Include="..\src\ca\ca3300d.rep" />
    <RepCompiler Include="..\src\ca\ca3600a.rep" />
    <RepCompiler Include="..\src\ca\ca3700a.rep" />
-    <RepCompiler Include="..\src\ca\ca3800a.rep" />
+    <RepCompiler Include="..\src\ca\ca3800a.rep">
-    <RepCompiler Include="..\src\ca\ca3800b.rep" />
+      <SubType>Designer</SubType>
-    <RepCompiler Include="..\src\ca\ca3800c.rep" />
+    </RepCompiler>
    <RepCompiler Include="..\src\ca\ca3800b.rep">
      <SubType>Designer</SubType>
    </RepCompiler>
    <RepCompiler Include="..\src\ca\ca3800c.rep">
      <SubType>Designer</SubType>
    </RepCompiler>
    <RepCompiler Include="..\src\ca\ca3900a.rep" />
  </ItemGroup>
  <ItemGroup>
--- a/build/fastrip.exe
+++ b/build/fastrip.exe
--- a/build/fastrip.vcxproj
+++ b/build/fastrip.vcxproj
@ -14,8 +14,8 @@
    <ProjectGuid>{68251613-3B9A-4F87-9F40-827C46267ADE}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>fastrip</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+
-  </PropertyGroup>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
--- a/build/fd.vcxproj
+++ b/build/fd.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -15,18 +15,21 @@
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>fd</RootNamespace>
    <ProjectName>fd0</ProjectName>
    <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>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>NotSet</CharacterSet>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>NotSet</CharacterSet>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/build/lv0.vcxproj
+++ b/build/lv0.vcxproj
@ -144,6 +144,7 @@
      <Version>12.0</Version>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/lv1.vcxproj
+++ b/build/lv1.vcxproj
@ -146,6 +146,7 @@
      <Version>12.0</Version>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/lv2.vcxproj
+++ b/build/lv2.vcxproj
@ -143,6 +143,7 @@
      <Version>12.0</Version>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/lv3.vcxproj
+++ b/build/lv3.vcxproj
@ -144,6 +144,7 @@
      <Version>12.0</Version>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@ -188,6 +189,7 @@
    <ClInclude Include="..\src\lv\lv3600a.h" />
    <ClInclude Include="..\src\lv\lv3700a.h" />
    <ClInclude Include="..\src\lv\lv3uml.h" />
    <ClInclude Include="..\src\ve\ve0100.h" />
  </ItemGroup>
  <ItemGroup>
    <CustomBuildStep Include="..\lib\AgaLib.lib">
--- a/build/lv3.vcxproj.filters
+++ b/build/lv3.vcxproj.filters
@ -100,6 +100,9 @@
    <ClInclude Include="..\src\lv\lv3uml.h">
      <Filter>Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\src\ve\ve0100.h">
      <Filter>Headers</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="campo.rc" />
--- a/build/lv4.vcxproj
+++ b/build/lv4.vcxproj
@ -147,6 +147,7 @@
      <Version>12.0</Version>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/mr0.vcxproj
+++ b/build/mr0.vcxproj
@ -63,10 +63,9 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\xi;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\xi;..\src\include;..\src\xvaga;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__;%(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>
@ -84,6 +83,7 @@
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/mr1.vcxproj
+++ b/build/mr1.vcxproj
@ -105,7 +105,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;WIN32;DBG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -113,7 +113,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -121,7 +120,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__%(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>
@ -135,6 +134,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/mr2.vcxproj
+++ b/build/mr2.vcxproj
@ -63,11 +63,10 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xi;../src/xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -76,7 +75,7 @@
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;__LONGDOUBLE__;%(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>
@ -91,6 +90,7 @@
      <TargetMachine>MachineX86</TargetMachine>
      <Version>12.0</Version>
      <Profile>false</Profile>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/msk232.bat
+++ b/build/msk232.bat
@ -8,7 +8,7 @@ type ..\src\include\uml.h >%TMP%\%~n1.tmp
 type %1 >>%TMP%\%~n1.tmp
 cl /nologo /EP %TMP%\%~n1.tmp >%TMP%\%~n1.tm2
-patchdef %TMP%\%~n1.tm2 %TMP%\%TMP%\%~n1.tm3
+patchdef %TMP%\%~n1.tm2 %TMP%\%~n1.tm3
 type ..\src\include\uml.h >%TMP%\%~n1.uml
 type %TMP%\%~n1.tm3 >>%TMP%\%~n1.uml
--- a/build/pg0001.vcxproj
+++ b/build/pg0001.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{9D5735F1-EE47-4ED3-929A-048FFF8B6344}</ProjectGuid>
    <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">
--- a/build/pg0067.vcxproj
+++ b/build/pg0067.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{453301DF-028E-479F-9548-C2346AD8C6ED}</ProjectGuid>
    <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">
--- a/build/pg0068.vcxproj
+++ b/build/pg0068.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{DE9692C8-AD5E-4AD1-A0BB-16B9A4F722F1}</ProjectGuid>
    <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">
--- a/build/pg0069.vcxproj
+++ b/build/pg0069.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{3B1237FC-2632-448E-B5F1-A1B2A3278E47}</ProjectGuid>
    <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">
--- a/build/pg0388.vcxproj
+++ b/build/pg0388.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4E392B08-31F0-48CC-AC05-5C6EE7A6473C}</ProjectGuid>
    <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">
--- a/build/pi0001.vcxproj
+++ b/build/pi0001.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{5379F62B-868B-4469-9FC9-993AF9ADE381}</ProjectGuid>
    <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">
--- a/build/pi0002.vcxproj
+++ b/build/pi0002.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{F154352E-CF6F-44A1-B45F-BAE74281A0AD}</ProjectGuid>
    <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">
--- a/build/pl0001.vcxproj
+++ b/build/pl0001.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{EAA83FEF-B3E6-4BDE-B746-2BE727FA057A}</ProjectGuid>
    <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">
--- a/build/pl0002.vcxproj
+++ b/build/pl0002.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{69D3E5F4-0C68-4171-9296-D01B7E885C89}</ProjectGuid>
    <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">
--- a/build/ps0017.vcxproj
+++ b/build/ps0017.vcxproj
@ -42,7 +42,7 @@
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exed\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
  </PropertyGroup>
@ -116,7 +116,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -138,6 +137,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0077.vcxproj
+++ b/build/ps0077.vcxproj
@ -68,7 +68,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -76,7 +75,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>
@ -90,6 +89,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0099.vcxproj
+++ b/build/ps0099.vcxproj
@ -114,7 +114,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -122,7 +121,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>
@ -136,6 +135,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0330.vcxproj
+++ b/build/ps0330.vcxproj
@ -68,7 +68,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -76,7 +75,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>
@ -90,6 +89,7 @@
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0398.vcxproj
+++ b/build/ps0398.vcxproj
@ -66,7 +66,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,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>
@ -87,6 +86,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
@ -115,7 +115,6 @@
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
    </ClCompile>
--- a/build/ps0430.vcxproj
+++ b/build/ps0430.vcxproj
@ -113,7 +113,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -121,7 +120,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>
@ -135,6 +134,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0431.vcxproj
+++ b/build/ps0431.vcxproj
@ -108,7 +108,6 @@
      <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -130,6 +129,7 @@
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <Version>12.0</Version>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0544.vcxproj
+++ b/build/ps0544.vcxproj
@ -113,7 +113,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -121,7 +120,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>
@ -135,6 +134,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0713.vcxproj
+++ b/build/ps0713.vcxproj
@ -67,7 +67,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -75,7 +74,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>
--- a/build/ps0816.vcxproj
+++ b/build/ps0816.vcxproj
@ -66,7 +66,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,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>
@ -88,6 +87,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0830.vcxproj
+++ b/build/ps0830.vcxproj
@ -66,7 +66,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,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>
@ -88,6 +87,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0872.vcxproj
+++ b/build/ps0872.vcxproj
@ -114,7 +114,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -122,7 +121,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>
@ -136,6 +135,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0883.vcxproj
+++ b/build/ps0883.vcxproj
@ -68,7 +68,6 @@
      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -77,7 +76,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>
@ -91,6 +90,7 @@
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <Version>12.0</Version>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0913
+++ b/build/ps0913
@ -67,7 +67,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -89,6 +88,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0920.vcxproj
+++ b/build/ps0920.vcxproj
@ -41,7 +41,7 @@
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@ -66,7 +66,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,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>
@ -88,6 +87,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0925.vcxproj
+++ b/build/ps0925.vcxproj
@ -66,7 +66,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,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>
@ -88,6 +87,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps0982
+++ b/build/ps0982
@ -67,7 +67,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -75,7 +74,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>
@ -89,6 +88,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps1001.vcxproj
+++ b/build/ps1001.vcxproj
@ -67,7 +67,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -75,7 +74,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>
@ -89,6 +88,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps1004.vcxproj
+++ b/build/ps1004.vcxproj
@ -116,7 +116,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -138,6 +137,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps1100.vcxproj
+++ b/build/ps1100.vcxproj
@ -66,7 +66,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,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>
@ -88,6 +87,8 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <LinkErrorReporting>PromptImmediately</LinkErrorReporting>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ps1104.vcxproj
+++ b/build/ps1104.vcxproj
@ -66,7 +66,6 @@
      <AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
      <ObjectFileName>.\..\debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -74,7 +73,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>
@ -88,6 +87,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/pt0001.vcxproj
+++ b/build/pt0001.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{1479CB30-7DF8-4F92-A3E6-856EA6F2210C}</ProjectGuid>
    <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">
--- a/build/pt0003.vcxproj
+++ b/build/pt0003.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{0AA531D2-E451-4214-B9CE-E06C9E42BA2D}</ProjectGuid>
    <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">
--- a/build/pt0195.vcxproj
+++ b/build/pt0195.vcxproj
@ -1,5 +1,5 @@
 <?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>
@ -12,15 +12,18 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{6796CEDE-A4D5-4340-B24D-F0E7DCEF050D}</ProjectGuid>
    <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">
--- a/build/tf0.vcxproj
+++ b/build/tf0.vcxproj
@ -92,6 +92,7 @@
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/build/ve0.vcxproj
+++ b/build/ve0.vcxproj
@ -66,7 +66,8 @@
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\src\li;../src/include;../src/xvaga;../src/xvtdb;../src/xvturl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
+      <MinimalRebuild>
      </MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
--- a/build/ve3.vcxproj
+++ b/build/ve3.vcxproj
@ -68,7 +68,6 @@
      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;__LONGDOUBLE__</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -93,6 +92,7 @@
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
    </Link>
    <Bscmake>
      <SuppressStartupBanner>true</SuppressStartupBanner>
--- a/exe/Cb6.dll
+++ b/exe/Cb6.dll
--- a/exe/DIR.GEN
+++ b/exe/DIR.GEN
--- a/exe/TRC.GEN
+++ b/exe/TRC.GEN
--- a/exe/campo.ini
+++ b/exe/campo.ini
@ -1,8 +1,8 @@
 [Main]
 Donglehw =4
-Firm =00001a
+Firm =00002a
 MaxHandles = 32
-Study =h:\e\dati\crpa\
+Study =h:\e\dati\bellegotti\
 Type = 1
 User = ADMIN
--- a/exe/gfm.dll
+++ b/exe/gfm.dll
--- a/exe/pdflib.dll
+++ b/exe/pdflib.dll
--- a/exe/recdesc/D90.DES
+++ b/exe/recdesc/D90.DES
@ -0,0 +1,102 @@
 [FieldDescr]
 ANTICORPI = Anticorpi
 BENEM = Vuole le benemerenze S/N
 CATDON = Categoria donatori
 CATNOND1 = Categoria non donatori 1
 CATNOND2 = Categoria non donatori 2
 CF = Codice fiscale
 CMV = CMV
 CODCL = Codice cartella clinica
 CODCT = Codice centro trasfusionale
 CODICE = Codice
 CODMED = Codice regionale medico di base
 CODSEZ = Codice sezione di appartenenza
 CODSOT = Codice sottogruppo di appartenenza
 COGNOME = Cognome
 COGNOME_SP = Cognome del marito
 COMNASC = Codice comune o stato estero di nascita
 CONDOCC = Condizione occupazionale (da cambiare)
 CONSENSO = Consenso informato (legge privacy)
 DATAAF = Data stato AF
 DATACONV = Data ultima convocazione spedita
 DATADIM = Data dimissione
 DATAISC = Data iscrizione
 DATANASC = Data di nascita
 DATAPRIAF = Data prima donazione AF
 DATAPRISI = Data prima donazione SI
 DATAPROSAF = Data prossima AF
 DATAPROSSI = Data prossima SI
 DATASI = Data stato SI
 DATASTATO = Data in cui è stato attribuito lo stato
 DATAULTAF = Data ultima donazione AF
 DATAULTAGG = Data ultimo aggiornamento
 DATAULTDON = Data ultima donazione
 DATAULTID = Data ultima idoneità
 DATAULTSI = Data ultima donazione SI
 DATAULTSOL = Data ultimo sollecito
 DATA_PROS = Data prossimo stato (per fine sospensione)
 DISP_AF_1 = Disponibilita AF 1
 DISP_AF_2 = Disponibilita AF 2
 DOCID = Documento di identità
 DOM_CAP = Domicilio - CAP
 DOM_CODCOM = Domicilio - codice comune
 DOM_CODLOC = Domicilio - codice localita' postale
 DOM_DISTRI = Domicilio - presso/località - ex distribuzione
 DOM_INDIR = Domicilio - indirizzo
 DOM_STRADA = Domicilio - codice stradario
 DONPRECAF = Numero donazioni AF non dettagliate
 DONPRECSI = Numero donazioni SI non dettagliate
 DU = Du
 EMAIL = Indirizzo di posta elettronica
 ESCLUSO = Esclusione non sanitaria
 FENOTIPORH = Fenotipo Rh
 FINESOSAF = Data fine sospensione AF
 FINESOSSI = Data fine sospensione per SI
 GIOPRECON = Giorni preferiti per controlli
 GIOPREDON = Giorni preferiti per donazioni
 GRUPPOAB0 = Gruppo AB0
 GRUPPOAZIE = Codice gruppo aziendale
 IDON1 = Idoneità 1
 IDON2 = Idoneità 2
 IDON3 = Idoneità 3
 IDON4 = Idoneità 4
 INTAF = Intervallo aferesi
 INTSI = Intervallo sangue intero
 KELL = Kell
 LUOGOLAV = Luogo di lavoro (codice)
 MODCONV = Modalita' di convocazione
 MOTESCL = Motivo esclusione
 NOME = Nome
 NOTE = Note
 NOTIZIARIO = Vuole il notiziario S/N
 NUMCONV = Numero convocazioni spedite
 POSPROF = Posizione professionale (da cambiare)
 PROFESS = Professione (codice)
 PROS_STATO = Stato prossimo
 PUNTORACC = Punto di raccolta per convocazione
 RAMOATT = Ramo di attività (da cambiare)
 RES_CAP = Residenza - CAP
 RES_CODCOM = Residenza - codice comune
 RES_CODLOC = Residenza - codice localita' postale
 RES_INDIR = Residenza - indirizzo
 RHANTID = Rh/AntiD
 SESSO = Sesso
 STATO = Stato attuale
 STATOAF = Stato sanitario AF
 STATOSI = Stato sanitario per SI
 TELABI = Telefono abitazione
 TELALT = Telefono altro
 TELLAV = Telefono lavoro
 TERMESCL = Data termine esclusione
 TESSAVIS = Tessera AVIS
 TESSSSN = Tessera SSN
 TIPOULTDON = Tipo ultima donazione
 TIPOULTID = Tipo ultima idoneità
 TITINDIR = Titolo in indirizzo
 TITSTUD = Titolo di studio (da cambiare)
 TOTDON = Totale donazioni
 TOTDONAF = Numero donazioni AF
 TOTDONSI = Numero donazioni SI
 T_STAMPATA = Tessera stampata (S/N)
 UTENULTAGG = Utente ultimo aggiornamento
--- a/exe/recdesc/D92.DES
+++ b/exe/recdesc/D92.DES
@ -1,3 +1,18 @@
 [FieldDescr]
-XX =  
+CC = CC
 CODICE = Codice soggetto
 CODSEZ = Sezione di app. al momento della donazione
 CODSOT = Sottogruppo di app.
 DATADON = Data donazione
 ETICHETTA = Etichetta sacca
 HB = Hb
 LUOGODON = Luogo donazione
 PA = P.A.
 PRIMADON = Prima donazione
 PROGDON = Progressivo donazione per soggetto
 PROGINS = Progressivo inserimento
 PROTIDEMIA = Protidemia
 SGPT = SGPT
 TIPODON = Tipo donazione
 XX = 
--- a/exe/recdesc/D93.DES
+++ b/exe/recdesc/D93.DES
@ -0,0 +1,17 @@
 [FieldDescr]
 CODICE = Codice soggetto
 DATACON = Data controllo
 IDON1 = Idoneità 1
 IDON2 = Idoneità 2
 IDON3 = Idoneità 3
 IDON4 = Idoneità 4
 INTAF = Intervallo per aferesi
 INTSI = Intervallo per sangue intero
 MOTIVO = Motivo (per controlli che modificano lo stato)
 PROGCON = Progressivo controllo
 PROSSDATA = Data prossimo tipo
 PROSSTIPO = Prossimo tipo di controllo (programmato e/o presunto)
 RESPONSAB = Responsabile (per controlli che modificano lo stato)
 SINGOLI = Singoli controlli
 TIPOCON = Tipo o esito controllo
--- a/exe/recdesc/D95.DES
+++ b/exe/recdesc/D95.DES
@ -0,0 +1,6 @@
 [FieldDescr]
 CODFAM = Codice soggetto familiare
 FAMIGLIA = Codice famiglia (progressivo automatico)
 GRADOPAR = Grado di parentela
 PROGFAM = Progressivo familiare
--- a/exe/recdesc/D96.DES
+++ b/exe/recdesc/D96.DES
@ -0,0 +1,40 @@
 [FieldDescr]
 CATCANC = Categoria cancellati
 CATEMER = Categoria emeriti
 CATESTI = Categoria estinti
 CODSEZ = Codice sezione
 CODSOT = Codice sottogruppo
 COM = Codice comune residenza
 CONVNOTE = Note
 CONVORA = Orario per stampa cartolina
 CONVSEDE1 = Sede: 1° riga
 CONVSEDE2 = Sede: 2° riga
 CONVSEDE3 = Sede: 3° riga
 CONVSEDE4 = Sede: 4° riga
 DATAULTCON = Data ultima convocazione
 DENOMINAZ = Denominazione completa della sezione
 DENSEZ = Denominazione sezione
 DENSOT = Denominazione sottogruppo
 DONEMER = Numero donazioni per passaggio a emeriti
 FAX = Fax sezione
 GIOCARSOL = Giorni tra cartolina e primo sollecito
 GIOPERRIT = Giorni tra le chiamate per ritardatari
 GIOSOLSOL = Giorni tra sollecito e sollecito
 GIOULTSOL = Giorni tra penultimo e ultimo sollecito
 INDIRIZZO = Indirizzo
 INTESTAZ1 = 1° Riga di intestazione per tessere e cartoline
 INTESTAZ2 = 2° Riga di intestazione per tessere e cartoline
 INTESTAZ3 = 3° Riga di intestazione per tessere e cartoline
 INTESTAZ4 = 4° Riga di intestazione per tessere e cartoline
 INTESTI = Intervallo di estinzione in anni
 INTMAX = Intervallo max per cartolina
 INTMIN = Intervallo min. per cartolina
 INTMINCONV = Intervallo minimo di convocazione in gg.
 LOCALITA = Località postale
 NUMMAXSOL = Numero massimo di solleciti
 PUNTORACC = Codice punto di raccolta per convocazione
 REFERCED = Cognome e nome referente CED
 STATO = Stato sezione
 TELEFONO = Telefono sezione
 TIPOCONV = Tipo convocazione
--- a/exe/recdesc/D97.DES
+++ b/exe/recdesc/D97.DES
@ -0,0 +1,10 @@
 [FieldDescr]
 CODMED = Codice regionale del medico
 COGNOME = Cognome medico
 COM = Codice comune di residenza
 INDIRIZZO = Indirizzo medico
 LOCALITA = Località postale
 NOME = Nome medico
 TELABI = Telefono abitazione
 TELAMB = Telefono ambulatorio
--- a/exe/recdesc/d154.des
+++ b/exe/recdesc/d154.des
@ -1,6 +1,7 @@
 [FieldDescr]
 AL = Data fine periodo
 ANNO = Anno
 CHIUSA = Indica se una lettera di intento è chiusa
 CODCLI = Codice cliente
 DAL = Data inizio periodo
 DATAREG = Data di registrazione
@ -8,6 +9,8 @@ IMPORTO = Importo
 INVIATO = Inviato
 NOTE = Note
 NUMPROT = Numero protocollo
 PROTINTF = Numero di protocollo passato dall agenzia delle entrate (prima parte)
 PROTINTS = Numero di protocollo passato dall agenzia delle entrate (seconda parte)
 STAMPATO = Stampato
 TIPOOP = Tipo operazione (1=singola,2=fino a,3=nel periodo dal/al)
 UFFIVA = Codice ufficio IVA
--- a/exe/recdesc/d168.des
+++ b/exe/recdesc/d168.des
@ -46,7 +46,7 @@ RIFBOL = Riferimenti bolle in fattura
 RIFBOLFAT = Riferimenti bolle in fattura
 RIPCONS = Stampa riepilogo consegne
 RITAUDTTMP = Ritiro automatico dotazione temporanea
-SSCONS = Spese di spedizione alla consegna
+SSCONS = Spese da addebitare alla consegna
 STATUS = Stato del contratto, <CH>chiuso, <CO>confermato, <DC>da confermare
 STDDTPTS = Stampa DDT da pulito con Touch Screen
 STDICITURA = Stampa dicitura
--- a/exe/recdesc/d171.des
+++ b/exe/recdesc/d171.des
@ -7,6 +7,7 @@ DATAREGP = Data pagamento
 IMPONIBILE = Imponibile
 IMPORTO = Importo
 IMPOSTA = Imposta
 INDETR = Riga di IVA indetraibile
 MESELIQ = Mese liquidazione
 NUMPRO = Numero progressivo PAG o NC
 NUMREG = Numero operazione Fattura
--- a/exe/recdesc/d20.des
+++ b/exe/recdesc/d20.des
@ -12,7 +12,7 @@ CODCFASS = Codice cliente (fornitori) o fornitore (clienti) associato
 CODCFFATT = Codice cliente (fornitore) cui fatturare
 CODLIN = Codice lingua
 CODPAG = Codice pagamento
-CODRFSO = Missing description
+CODRFSO = Codice Rappresentate Fisc/Stabile Org
 CODSTAT = Codice statistico
 CODVAL = Codice valuta
 COFI = Codice fiscale
@ -22,7 +22,7 @@ CONTO = Conto prevalente (se presente)
 CONTORIC = Conto prevalente di ricavo (se presente)
 DATAAGG = Data ultima modifica
 DATANASC = Data di nascita
-DATARFSO = Missing description
+DATARFSO = Data Rappresentate Fisc/Stabile Org
 DIPPUBB = Dipendente Pubblico
 DIRTY = Anagrafica modificata (NON UTILIZZATO)
 DOCMAIL = Indirizzo di posta elettronica per i documenti
@ -34,15 +34,15 @@ GRUPPORIC = Gruppo prevalente di ricavo (se presente)
 IBAN = Codice IBAN
 INDCF = Indirizzo
 INDENTE = Indirizzo ente (Dipendente Pubblico)
-INIFATTEL = Missing description
+INIFATTEL = Data inizio fatturazione elettronica
-INIREVCHG = Missing description
+INIREVCHG = Data inizio reverse charge
 LOCALITACF = Loacalita'
 MAIL = Indirizzo di posta elettronica generico
 NUMCC = Numero di conto corrente
 OCCAS = Cliente / fornitore occasionale
 OGGETTI = Link ad oggetti esterni
 PAIV = Partita IVA
-PEC = Missing description
+PEC = Indirizzo di posta elettronica certificato
 PFAX = Prefisso del numero di FAX
 PTEL = Prefisso del numero di telefono
 PTEL2 = Prefisso del 2 numero di telefono
--- a/exe/recdesc/d23.des
+++ b/exe/recdesc/d23.des
@ -4,6 +4,7 @@ ANNOFE = Anno invio definitivo dati rilevanti
 ANNOIVA = Anno IVA
 CAMBIO = Cambio della valuta
 CAMBIOI = Cambio della valuta intra-comunitaria
 CFBOLLADOG = Codice fornitore a cui è riferita la bolla doganale
 CODCAUS = Codice causale
 CODCF = Codice
 CODPAG = Codice pagamento
@ -29,6 +30,7 @@ DPROVV = Documento originale PROVV
 INVIATO = Inviato ad altra contabilità
 INVIOFE = Data invio definitivo dati rilevanti
 INVIVA = Inviata la parte IVA ad altra contabilita'
 IVALIQ = Iva per cassa liquidata completamente
 IVAXCASSA = Flag di movimento IVA per cassa
 LIQDIFF = Flag di movimento a liquidazione differita
 MESELIQ = Mese per liquidazione differita
@ -45,11 +47,14 @@ PROVVIS = Tipo movimento (" " Normale, "P" Provvisorio cancellabile, "C" Provvis
 REG = Codice registro IVA
 REGST = Stampato su registro IVA
 REVCHARGE = Reverse charge
 RITFATT = Fattura in ritardo
 RITFIS = Ritenute fiscali
 RITSOC = Ritenute sociali
 SCARCON = Scaricata la contabilitá
 SPLITPAY = Flag di scissione pagamenti [_=Auto,S=Split,N=Normale]
 STAMPATO = Stampato su giornale
 TFDATA = Data ultimo invio Trasferimento Fatture
 TFINVIO = Flag Invio Trasferimento Fatture
 TIPO = Tipo <C>liente o <F>ornitore
 TIPODOC = Tipo documento
 TIPOMOV = Tipo movimento
--- a/exe/recdesc/d26.des
+++ b/exe/recdesc/d26.des
@ -7,6 +7,7 @@ CODCAUSIM = Codice causale incasso immediato
 COLLCESP = Collegamnto ai cespiti
 CONTIND = Causale per contabilità industriale
 DATADOC = Data documento
 DATAREGPR = Data di registrazion nell'ereserciozio precedente per il caso del campo precedente
 DESCR = Descrizione causale
 INTRACOM = Movimento intra-comunitario
 LIQDIFF = Fatture a liquidazione differita
@ -20,7 +21,8 @@ NUMDOC = Numero documento
 PROVV = Tipo movimento (" " Normale, "P" Provvisorio cancellabile, "C" Provvisorio da cepiti)
 REG = Codice registro
 REGSPIVA = Regimi speciali IVA
-RITFATT = 
+RILFTEMRI = Causale di rilevazione fatture de emettere o ricevere
 RITFATT = Fattura in ritardo
 SOLOIVA = Movimento di sola IVA
 SOSPESO = Causale sospesa
 TIPODOC = Tipo documento
--- a/exe/recdesc/d3.des
+++ b/exe/recdesc/d3.des
@ -22,6 +22,7 @@ D1 =
 D2 = 
 D3 = 
 D4 = 
 DATAAGG = 
 FPC = 
 I0 = 
 I1 = 
@ -66,6 +67,7 @@ R30 =
 R31 = 
 R32 = 
 R33 = 
 R34 = 
 R4 = 
 R5 = 
 R6 = 
@ -76,6 +78,9 @@ S0 =
 S1 = 
 S10 = 
 S11 = 
 S12 = 
 S13 = 
 S14 = 
 S2 = 
 S3 = 
 S4 = 
@ -84,4 +89,5 @@ S6 =
 S7 = 
 S8 = 
 S9 = 
 UTENTE = 
--- a/exe/recdesc/d33.des
+++ b/exe/recdesc/d33.des
@ -93,6 +93,7 @@ TARA = Tara
 TIPOCF = Tipo <C>liente <F>ornitore
 TIPOCFFATT = Tipo <C>liente <F>ornitore cui fatturare
 TIPODOC = Tipo documento
 TIPODOCSDI = Tido documento secondo Agenzia delle Entrate
 UMPNETTO = Unità di misura per il peso netto
 UMTARA = Unità di misura per la tara
 UTENTE = Utente ultimo aggiornamento
--- a/exe/recdesc/d4.des
+++ b/exe/recdesc/d4.des
@ -78,6 +78,9 @@ S0 =
 S1 = 
 S10 = 
 S11 = 
 S12 = 
 S13 = 
 S14 = 
 S2 = 
 S3 = 
 S4 = 
--- a/exe/recdesc/d5.des
+++ b/exe/recdesc/d5.des
@ -78,6 +78,9 @@ S0 =
 S1 = 
 S10 = 
 S11 = 
 S12 = 
 S13 = 
 S14 = 
 S2 = 
 S3 = 
 S4 = 
--- a/exe/recdesc/d6.des
+++ b/exe/recdesc/d6.des
@ -45,6 +45,7 @@ STATOPAIV =
 STATORES = 
 TELRF = 
 TIPOA = 
 TIPORFSO = Definisce se la persona è un <R>appr. Fiscale, <S>tabile Organizzazione o nessuno dei due
 TIPOSTDEL = 
 TITCF = 
 TLEXRFX = 
@ -52,6 +53,7 @@ UFFCONC =
 UFFIIDD = 
 UFFIVA = 
 UFFUUE = 
 UTENTE = 
 VARDF = 
 VARSLORES = 
--- a/exe/recdesc/d9.des
+++ b/exe/recdesc/d9.des
@ -10,6 +10,7 @@ CESSIVA = Cessata attivita' o variata partita IVA
 CODANAGR = 
 CODATTPREV = 
 CODDITTA = 
 CODRFSO = Codice Rappresentante Fiscale/Stabile Organizzazione
 CODSOGDEL = Codice del soggetto delegato
 CODSTAT1 = 
 CODSTAT2 = 
@ -18,6 +19,7 @@ COMAA =
 CONDFAM = 
 CONTORD = 
 DATAISCRAA = 
 DATARFSO = Data immissione valore
 DATLAV = 
 DECCARINT = 
 DEDART13 = 
--- a/exe/recdesc/f109.dir
+++ b/exe/recdesc/f109.dir
@ -1,3 +1,3 @@
 109
 0
-$mag|0|0|692|0|Giacenze di magazzino|||
+$mag|38313|38313|692|0|Giacenze di magazzino|||
--- a/exe/recdesc/f109.trr
+++ b/exe/recdesc/f109.trr
@ -47,6 +47,7 @@ USER5|4|15|5|campo definito dall'utente
 USERVAL5|4|18|3|valore
 USER6|4|15|5|campo definito dall'utente
 USERVAL6|4|18|3|valore
-2
+3
 ANNOES+CODART+NRIGA| 
 ANNOES+CODMAG+CODART+LIVELLO|X
 ANNOES+CODMAG+LIVELLO|X
--- a/exe/recdesc/f120.dir
+++ b/exe/recdesc/f120.dir
@ -1,3 +1,3 @@
 120
 1
-m770/quadrodb|0|0|117|4|Quadro D bis 770|||
+m770/quadrodb|0|0|118|0|Quadro D bis 770|||
--- a/exe/recdesc/f120.trr
+++ b/exe/recdesc/f120.trr
@ -5,7 +5,7 @@ TIPOA|1|1|0|Tipo anagrafica (Sempre 'F')
 CODANAGR|3|5|0|Codice anagrafica
 NPROG|2|4|0|Numero progressivo di riga
 CODCAUS|9|2|0|Codice causale
-CAUSALE|1|1|0|15 - Causale
+CAUSALE|1|2|0|15 - Causale
 TOTALE|4|18|0|16 - Ammontare lordo corrisposto
 SOMME|4|18|0|17 - Somme non soggette a ritenuta
 IMPONIBILE|4|18|0|19 - Imponibile
--- a/exe/recdesc/f3.dir
+++ b/exe/recdesc/f3.dir
@ -1,3 +1,3 @@
 3
 1
-%tabgen|0|0|1181|0|Tabelle di studio|50||
+%tabgen|0|0|1285|0|Tabelle di studio|50||
--- a/exe/recdesc/f3.trr
+++ b/exe/recdesc/f3.trr
@ -1,5 +1,5 @@
 3
-86
+91
 COD|1|3|0|
 CODTAB|1|25|0|
 S0|1|70|0|
@ -14,6 +14,9 @@ S8|1|5|0|
 S9|1|5|0|
 S10|1|5|0|
 S11|1|5|0|
 S12|1|5|0|
 S13|1|70|0|
 S14|1|5|0|
 I0|3|7|0|
 I1|3|7|0|
 I2|3|7|0|
@ -59,11 +62,11 @@ R26|4|18|5|
 R27|4|18|5|
 R28|4|18|5|
 R29|4|18|5|
 R29|4|18|5|
 R30|4|18|5|
 R31|4|18|5|
 R32|4|18|5|
 R33|4|18|5|
 R34|4|18|5|
 D0|5|8|0|
 D1|5|8|0|
 D2|5|8|0|
@ -85,6 +88,8 @@ B12|8|1|0|
 B13|8|1|0|
 B14|8|1|0|
 B15|8|1|0|
 DATAAGG|5|8|0|
 UTENTE|1|16|0|
 FPC|8|1|0|
 2
 COD+CODTAB| 
--- a/exe/recdesc/f39.dir
+++ b/exe/recdesc/f39.dir
@ -1,3 +1,3 @@
 39
 1
-m770/schper|0|0|193|0|Schede percipienti|#9||
+m770/schper|0|0|194|0|Schede percipienti|#9||
--- a/exe/recdesc/f39.trr
+++ b/exe/recdesc/f39.trr
@ -16,7 +16,7 @@ TOTRIT|4|18|2|Totale ritenute (collegamento contabilit
 RITSOC|4|18|2|Ritenute sociali (collegamento contabilità)
 MESEC|2|2|0|Mese competenza
 ANNOC|2|4|0|Anno competenza
-CAUSQUA|7|1|0|Causale quadro
+CAUSQUA|1|2|0|Causale quadro
 FLAGTS|7|1|0|Flag T.S.
 RITOPE|4|18|2|Ritenute operate
 RITVER|4|18|2|Ritenute versate
--- a/exe/recdesc/f4.dir
+++ b/exe/recdesc/f4.dir
@ -1,3 +1,3 @@
 4
 1
-%tabcom|0|0|1210|0|Tabelle comuni|1500||
+%tabcom|0|0|1285|0|Tabelle comuni|1500||
--- a/exe/recdesc/f4.trr
+++ b/exe/recdesc/f4.trr
@ -1,5 +1,5 @@
 4
-89
+91
 COD|1|3|0|
 CODTAB|1|25|0|
 S0|1|70|0|
@ -15,6 +15,8 @@ S9|1|5|0|
 S10|1|5|0|
 S11|1|5|0|
 S12|1|5|0|
 S13|1|70|0|
 S14|1|5|0|
 I0|3|7|0|
 I1|3|7|0|
 I2|3|7|0|
--- a/exe/recdesc/f5.dir
+++ b/exe/recdesc/f5.dir
@ -1,3 +1,3 @@
 5
 0
-$tab|0|0|1197|0|Tabelle ditta|400||
+$tab|3666|3666|1285|0|Tabelle ditta|400||
--- a/exe/recdesc/f5.trr
+++ b/exe/recdesc/f5.trr
@ -1,5 +1,5 @@
 5
-88
+91
 COD|1|3|0|
 CODTAB|1|25|0|
 S0|1|70|0|
@ -14,6 +14,9 @@ S8|1|5|0|
 S9|1|5|0|
 S10|1|5|0|
 S11|1|5|0|
 S12|1|5|0|
 S13|1|70|0|
 S14|1|5|0|
 I0|3|7|0|
 I1|3|7|0|
 I2|3|7|0|
--- a/exe/recdesc/f61.dir
+++ b/exe/recdesc/f61.dir
@ -1,3 +1,3 @@
 61
 1
-m770/quadroc|||192|0|Quadro C 770|||
+m770/quadroc|0|0|193|0|Quadro C 770|||
--- a/exe/recdesc/f61.trr
+++ b/exe/recdesc/f61.trr
@ -7,7 +7,7 @@ NPROG|2|4|0|Numero progressivo
 GENERATA|8|1|0|Riga generata dalle schede
 CODCAUS|9|2|0|Codice causale
 PERC|4|6|2|Aliquota applicata
-CAUSALE|1|1|0|11 - Causale quadro C
+CAUSALE|1|2|0|11 - Causale quadro C
 TASSAZIONE|6|1|0|12 - Tassazione operata
 AMMLORDO|4|18|0|13 - Ammontare lordo corrisposto
 CONTROBB|4|18|0|14 - Contributi obbligatori
--- a/exe/recdesc/f62.dir
+++ b/exe/recdesc/f62.dir
@ -1,3 +1,3 @@
 62
 1
-m770/quadrod|0|0|116|4|Quadro D 770|||
+m770/quadrod|0|0|117|0|Quadro D 770|||
--- a/exe/recdesc/f62.trr
+++ b/exe/recdesc/f62.trr
@ -5,7 +5,7 @@ TIPOA|1|1|0|Tipo anagrafica (Sempre 'F')
 CODANAGR|3|5|0|Codice anagrafica
 NPROG|2|4|0|Numero progressivo di riga
 CODCAUS|9|2|0|Codice causale
-CAUSALE|1|1|0|15 - Causale
+CAUSALE|1|2|0|15 - Causale
 TOTALE|4|18|2|16 - Ammontare lordo corrisposto
 SOMME|4|18|2|17 - Somme non soggette a ritenuta
 IMPONIBILE|4|18|2|19 - Imponibile
--- a/exe/recdesc/f63.dir
+++ b/exe/recdesc/f63.dir
@ -1,3 +1,3 @@
 63
 1
-m770/quadrod1|0|0|116|4|Quadro D1 770|||
+m770/quadrod1|0|0|117|0|Quadro D1 770|||
--- a/exe/recdesc/f63.trr
+++ b/exe/recdesc/f63.trr
@ -5,7 +5,7 @@ TIPOA|1|1|0|Tipo anagrafica (sempre 'F')
 CODANAGR|3|5|0|Codice anagrafica
 NPROG|2|4|0|Numero progrssivo riga
 CODCAUS|9|2|0|Codice causale
-CAUSALE|7|1|0|11 - Causale
+CAUSALE|1|2|0|11 - Causale
 TOTALE|4|18|2|12 - Ammontare lordo corrisposto
 QUOTAPRO|4|18|2|14 - Quota provvigioni
 SPESEANT|4|18|2|13 - Spese anticipate
--- a/Show More
+++ b/Show More
`@ -1,3 +1,3 @@`
	`109`	`109`
	`0`	`0`
	`$mag\|0\|0\|692\|0\|Giacenze di magazzino\|\|\|`	`$mag\|38313\|38313\|692\|0\|Giacenze di magazzino\|\|\|`
`@ -1,3 +1,3 @@`
	`120`	`120`
	`1`	`1`
	`m770/quadrodb\|0\|0\|117\|4\|Quadro D bis 770\|\|\|`	`m770/quadrodb\|0\|0\|118\|0\|Quadro D bis 770\|\|\|`
`@ -1,3 +1,3 @@`
	`3`	`3`
	`1`	`1`
	`%tabgen\|0\|0\|1181\|0\|Tabelle di studio\|50\|\|`	`%tabgen\|0\|0\|1285\|0\|Tabelle di studio\|50\|\|`
`@ -1,3 +1,3 @@`
	`39`	`39`
	`1`	`1`
	`m770/schper\|0\|0\|193\|0\|Schede percipienti\|#9\|\|`	`m770/schper\|0\|0\|194\|0\|Schede percipienti\|#9\|\|`
`@ -1,3 +1,3 @@`
	`4`	`4`
	`1`	`1`
	`%tabcom\|0\|0\|1210\|0\|Tabelle comuni\|1500\|\|`	`%tabcom\|0\|0\|1285\|0\|Tabelle comuni\|1500\|\|`
`@ -1,3 +1,3 @@`
	`5`	`5`
	`0`	`0`
	`$tab\|0\|0\|1197\|0\|Tabelle ditta\|400\|\|`	`$tab\|3666\|3666\|1285\|0\|Tabelle ditta\|400\|\|`
`@ -1,3 +1,3 @@`
	`61`	`61`
	`1`	`1`
	`m770/quadroc\|\|\|192\|0\|Quadro C 770\|\|\|`	`m770/quadroc\|0\|0\|193\|0\|Quadro C 770\|\|\|`
`@ -1,3 +1,3 @@`
	`62`	`62`
	`1`	`1`
	`m770/quadrod\|0\|0\|116\|4\|Quadro D 770\|\|\|`	`m770/quadrod\|0\|0\|117\|0\|Quadro D 770\|\|\|`
`@ -1,3 +1,3 @@`
	`63`	`63`
	`1`	`1`
	`m770/quadrod1\|0\|0\|116\|4\|Quadro D1 770\|\|\|`	`m770/quadrod1\|0\|0\|117\|0\|Quadro D1 770\|\|\|`