root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'R_10_00' of http://10.65.20.33/sirio/CAMPO/campo into R_10_00

Browse Source
This commit is contained in:
Sirio Builder 2020-08-27 18:30:57 +02:00
commit 30bcc82e23
87 changed files with 1741 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/AgaLib.vcxproj
View File

@ -795,7 +795,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
<Library Include="..\libraries\SQLite3\LibX86\sqlite3.lib" />
<Library Include="..\lib\xvtdb.lib" />
<EmbeddedResource Include="..\lib\xvtdb.lib">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<FileType>Document</FileType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="agalib_alx.vcxproj">
@ -870,6 +873,9 @@
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="xvtdb.vcxproj">
<Project>{9c91bacf-9a70-4973-b8cc-fa3d2af9867c}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/AgaLib.vcxproj.filters
View File

@ -779,8 +779,10 @@
<Library Include="..\libraries\SQLite3\LibX86\sqlite3.lib">
<Filter>Libraries</Filter>
</Library>
<Library Include="..\lib\xvtdb.lib">
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\lib\xvtdb.lib">
<Filter>Libraries</Filter>
</Library>
</EmbeddedResource>
</ItemGroup>
</Project>

1
build/Ba3.vcxproj
View File

@ -229,6 +229,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cg2103.cpp" />
<ClCompile Include="..\src\cg\cglib01.cpp" />
<ClCompile Include="..\src\cg\cglib03.cpp" />
<ClCompile Include="..\src\cg\cgpagame.cpp">

7
build/Bacnv.vcxproj
View File

@ -196,10 +196,17 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</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>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\cg\cglib.h" />
<ClInclude Include="..\src\cg\cgsaldac.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="CampoRules.targets" />

8
build/Bacnv.vcxproj.filters
View File

@ -34,4 +34,12 @@
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\cg\cglib.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\cg\cgsaldac.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

22
build/Cg0.vcxproj
View File

@ -199,30 +199,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.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\cg\cglib02.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\cg\cglib03.cpp" />
<ClCompile Include="..\src\cg\cglib05.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\src\cg\cgpim.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\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg0100a.uml" />
@ -292,7 +274,6 @@
<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>
@ -314,6 +295,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>
<RepCompiler Include="..\src\cg\cg0800a.rep">

18
build/Cg0.vcxproj.filters
View File

@ -54,12 +54,6 @@
<ClCompile Include="..\src\cg\cg0700.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgpim.cpp">
<Filter>Sources</Filter>
</ClCompile>
@ -69,18 +63,9 @@
<ClCompile Include="..\src\cg\cg0800.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib05.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ba\ba8500.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg0100a.uml">
@ -266,9 +251,6 @@
<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" />

22
build/Cg1.vcxproj
View File

@ -256,25 +256,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.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\cg\cglib02.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\cg\cglib03.cpp" />
<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>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg1100a.uml" />
@ -339,6 +320,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">

12
build/Cg1.vcxproj.filters
View File

@ -69,24 +69,12 @@
<ClCompile Include="..\src\cg\cg1700.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg1311.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg1312.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg1313.cpp">
<Filter>Sources</Filter>
</ClCompile>

23
build/Cg2.vcxproj
View File

@ -205,20 +205,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cg2300.cpp" />
<ClCompile Include="..\src\cg\cglib01.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\cg\cglib02.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\cg\cglib03.cpp" />
<ClCompile Include="..\src\cg\cglib06.cpp" />
<ClCompile Include="..\src\cg\cgpagame.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -226,12 +212,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cgsalda3.cpp" />
<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\in\inlib01.cpp" />
</ItemGroup>
<ItemGroup>
@ -302,6 +282,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="f1lib.vcxproj">
<Project>{41f4c25f-6bd2-4fc9-a0d3-a68cd1c9e4fc}</Project>
</ProjectReference>

15
build/Cg2.vcxproj.filters
View File

@ -45,33 +45,18 @@
<ClCompile Include="..\src\cg\cg2200.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgpagame.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsalda3.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\in\inlib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg2300.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib06.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg2100a.uml">

22
build/Cg3.vcxproj
View File

@ -222,26 +222,7 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cg3900.cpp" />
<ClCompile Include="..\src\cg\cglib01.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\cg\cglib02.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\cg\cglib03.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\cg\cgsalda3.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg3100a.uml" />
@ -324,6 +305,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">

12
build/Cg3.vcxproj.filters
View File

@ -55,24 +55,12 @@
<ClCompile Include="..\src\cg\cg3900.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsalda3.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg3601.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg3100a.uml">

23
build/Cg4.vcxproj
View File

@ -255,26 +255,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cg4b00.cpp" />
<ClCompile Include="..\src\cg\cglib01.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\cg\cglib02.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\cg\cglib03.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\cg\cglib05.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg4100b.uml" />
@ -343,6 +323,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>
<RepCompiler Include="..\src\cg\cg4b00a.rep">

15
build/Cg4.vcxproj.filters
View File

@ -66,27 +66,12 @@
<ClCompile Include="..\src\cg\cg4a00.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg4800.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg4b00.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib05.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg4100b.uml">

22
build/Cg5.vcxproj
View File

@ -228,25 +228,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cg5900.cpp" />
<ClCompile Include="..\src\cg\cglib01.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\cg\cglib02.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\cg\cglib03.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\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg5000a.uml" />
@ -334,6 +315,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">

12
build/Cg5.vcxproj.filters
View File

@ -56,21 +56,9 @@
<ClCompile Include="..\src\cg\cg5800.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg5900.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg5000a.uml">

33
build/Cg6.vcxproj
View File

@ -268,36 +268,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.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\cg\cglib02.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\cg\cglib03.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\cg\cglib04.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\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>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg6400a.uml" />
@ -346,6 +316,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">

15
build/Cg6.vcxproj.filters
View File

@ -73,21 +73,6 @@
<ClCompile Include="..\src\cg\cg6905.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib04.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\cg\cg6400a.uml">

3
build/Cg7.vcxproj
View File

@ -265,6 +265,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>
<None Include="..\src\cg\cg7400a.pdf" />

8
build/agalib.sln
View File

@ -36,6 +36,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdflibwrap", "pdflibwrap.vc
{8B0477F1-5D74-46C3-97B6-8879E2460A71} = {8B0477F1-5D74-46C3-97B6-8879E2460A71}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvtdb", "xvtdb.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -116,6 +118,12 @@ Global
{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Release|Win32.ActiveCfg = Release|Win32
{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Release|Win32.Build.0 = Release|Win32
{21876C3B-F5A9-4AAA-9D58-F8DDDAF6F10C}.Release|x64.ActiveCfg = Release|Win32
{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Debug|Win32.ActiveCfg = Debug|Win32
{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Debug|Win32.Build.0 = Debug|Win32
{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Debug|x64.ActiveCfg = Debug|Win32
{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Release|Win32.ActiveCfg = Release|Win32
{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Release|Win32.Build.0 = Release|Win32
{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

6
build/cg.sln
View File

@ -37,6 +37,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -103,6 +105,10 @@ 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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

149
build/cglib.vcxproj Normal file
View File

@ -0,0 +1,149 @@
<?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">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7B80F974-CE2E-4BD9-855A-44FF139FF288}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
</ResourceCompile>
<Lib>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0410</Culture>
</ResourceCompile>
<Lib>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
</Bscmake>
<Xdcmake>
<OutputFile>$(IntDir)$(TargetName).xml</OutputFile>
</Xdcmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib01.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib04.cpp" />
<ClCompile Include="..\src\cg\cglib05.cpp" />
<ClCompile Include="..\src\cg\cglib06.cpp" />
<ClCompile Include="..\src\cg\cglib07.cpp" />
<ClCompile Include="..\src\cg\cgpagame.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\cg\cglib.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

45
build/cglib.vcxproj.filters Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib04.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib05.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib06.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib07.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgpagame.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Sources">
<UniqueIdentifier>{70260e23-0399-4c69-b9a5-81a56f8d46d5}</UniqueIdentifier>
</Filter>
<Filter Include="Headers">
<UniqueIdentifier>{d1434fdc-d85e-4718-a745-03812af904b8}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\cg\cglib.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

25
build/ci.sln
View File

@ -1,16 +1,30 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1145
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ci0", "ci0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
ProjectSection(ProjectDependencies) = postProject
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C} = {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ci1", "ci1.vcxproj", "{0F684C8A-5184-44B2-8BAB-F234546ED1BA}"
ProjectSection(ProjectDependencies) = postProject
{A1CE9743-A597-4F92-B55A-345A366C9E55} = {A1CE9743-A597-4F92-B55A-345A366C9E55}
{2D38A763-3D74-4338-9362-B891784EC90E} = {2D38A763-3D74-4338-9362-B891784EC90E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ci2", "ci2.vcxproj", "{DE1487DC-4C9B-4150-BFE1-A79D6FE7B840}"
ProjectSection(ProjectDependencies) = postProject
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C} = {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -37,8 +51,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
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0DBC266B-3D9A-466C-B58C-A42B0A590826}
EndGlobalSection
EndGlobal

4
build/ci0.vcxproj
View File

@ -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>
@ -267,6 +266,9 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</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>

22
build/ci1.vcxproj
View File

@ -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>
@ -234,24 +233,6 @@
<RepCompiler Include="..\src\ci\ci1400a.rep" />
<RepCompiler Include="..\src\ci\ci1400b.rep" />
</ItemGroup>
<ItemGroup>
<CustomBuildStep Include="..\LIB\AgaLib.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
<CustomBuildStep Include="..\LIB\AgaLibD.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
<CustomBuildStep Include="..\lib\vedoc.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
<CustomBuildStep Include="..\lib\vedocd.lib">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>
@ -259,6 +240,9 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</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>

4
build/ci2.vcxproj
View File

@ -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>
@ -218,6 +217,9 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</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>

6
build/pl0002.vcxproj
View File

@ -72,7 +72,6 @@
<PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -117,7 +116,6 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -157,7 +155,6 @@
<ResourceCompile Include="campo.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib01.cpp" />
<ClCompile Include="..\src\ps\pl0002.cpp" />
<ClCompile Include="..\src\ps\pl0002100.cpp" />
<ClCompile Include="..\src\ps\pl0002lib.cpp" />
@ -169,6 +166,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">

3
build/pl0002.vcxproj.filters
View File

@ -41,9 +41,6 @@
<ClCompile Include="..\src\ps\pl0002100.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<MskCompiler Include="..\src\ps\pl0002100a.uml">

6
build/pr.sln
View File

@ -18,6 +18,8 @@ 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}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -44,6 +46,10 @@ 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
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

3
build/pr0.vcxproj
View File

@ -255,6 +255,9 @@
<ProjectReference Include="AgaLib.vcxproj">
<Project>{2d38a763-3d74-4338-9362-b891784ec90e}</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>

8
build/ps.sln
View File

@ -60,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ps6362", "ps6362.vcxproj",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ps0650", "ps0650.vcxproj", "{E7485070-16E1-4735-AD9D-B450C19B71C6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -230,6 +232,12 @@ Global
{E7485070-16E1-4735-AD9D-B450C19B71C6}.Release|Win32.ActiveCfg = Release|Win32
{E7485070-16E1-4735-AD9D-B450C19B71C6}.Release|Win32.Build.0 = Release|Win32
{E7485070-16E1-4735-AD9D-B450C19B71C6}.Release|x64.ActiveCfg = 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}.Debug|x64.ActiveCfg = Debug|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

6
build/ps0017.vcxproj
View File

@ -149,9 +149,6 @@
<ItemGroup>
<ClCompile Include="..\src\ca\calib01.cpp" />
<ClCompile Include="..\src\ca\calib02.cpp" />
<ClCompile Include="..\src\cg\cg2103.cpp" />
<ClCompile Include="..\src\cg\cglib01.cpp" />
<ClCompile Include="..\src\cg\cgsaldac.cpp" />
<ClCompile Include="..\src\ef\ef0101.cpp" />
<ClCompile Include="..\src\ef\ef0301.cpp" />
<ClCompile Include="..\src\ps\ps0017.cpp">
@ -197,6 +194,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>
<ResourceCompile Include="campo.rc" />

9
build/ps0017.vcxproj.filters
View File

@ -21,12 +21,6 @@
<ClCompile Include="..\src\ca\calib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ef\ef0101.cpp">
<Filter>Sources</Filter>
</ClCompile>
@ -39,9 +33,6 @@
<ClCompile Include="..\src\ps\ps0017100.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg2103.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\ps\ps0017.h">

22
build/ps0077.vcxproj
View File

@ -153,25 +153,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\ca\calib02.cpp" />
<ClCompile Include="..\src\cg\cg2101.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\cg\cglib02.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\cg\cglib03.cpp" />
<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\ef\ef0101.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -286,6 +267,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>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

12
build/ps0077.vcxproj.filters
View File

@ -28,18 +28,6 @@
<ClCompile Include="..\src\ca\calib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg2101.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ef\ef0101.cpp">
<Filter>Sources</Filter>
</ClCompile>

5
build/ps0099.vcxproj
View File

@ -145,8 +145,6 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib01.cpp" />
<ClCompile Include="..\src\cg\cglib02.cpp" />
<ClCompile Include="..\src\ps\ps0099.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -194,6 +192,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>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

6
build/ps0099.vcxproj.filters
View File

@ -22,12 +22,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ps\ps0099.cpp">
<Filter>Sources</Filter>
</ClCompile>

3
build/ps0430.vcxproj
View File

@ -208,6 +208,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>

9
build/ps0431.vcxproj
View File

@ -144,12 +144,6 @@
</CustomBuildStep>
</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\ps\ps0431.cpp" />
<ClCompile Include="..\src\ps\ps0431100.cpp" />
</ItemGroup>
@ -173,6 +167,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">

18
build/ps0431.vcxproj.filters
View File

@ -18,24 +18,6 @@
<ClCompile Include="..\src\ps\ps0431100.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg2103.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cg2101.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\ps\ps0431.h">

3
build/ps0544.vcxproj
View File

@ -222,6 +222,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>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

9
build/ps0713.vcxproj
View File

@ -150,12 +150,6 @@
<ItemGroup>
<ClCompile Include="..\src\ca\calib01.cpp" />
<ClCompile Include="..\src\ca\calib02.cpp" />
<ClCompile Include="..\src\cg\cglib01.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\cg\cgsaldac.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -247,6 +241,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>

3
build/ps0713.vcxproj.filters
View File

@ -24,9 +24,6 @@
<ClCompile Include="..\src\ca\calib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>

15
build/pz.sln
View File

@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1169
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pg0001", "pg0001.vcxproj", "{9D5735F1-EE47-4ED3-929A-048FFF8B6344}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pg0069", "pg0069.vcxproj", "{3B1237FC-2632-448E-B5F1-A1B2A3278E47}"
@ -29,6 +31,8 @@ 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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -91,8 +95,15 @@ 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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7D82AAF4-4C12-4FFC-A6B1-8C9ABE239223}
EndGlobalSection
EndGlobal

15
build/sv.sln
View File

@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1169
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv0", "sv0.vcxproj", "{B24F30AB-C349-4579-BF5B-58548B763544}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv1", "sv1.vcxproj", "{1AE03FAE-9ED0-482A-B3B2-F436BEB9DC0B}"
@ -11,6 +13,8 @@ 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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -37,8 +41,15 @@ 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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {349E813F-593C-4BEC-9768-6D890247F7D2}
EndGlobalSection
EndGlobal

16
build/sv0.vcxproj
View File

@ -70,7 +70,6 @@
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -144,18 +143,6 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib02.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\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\sv\sv0.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -215,6 +202,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>

6
build/sv0.vcxproj.filters
View File

@ -30,12 +30,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\sv\sv0.cpp">
<Filter>Sources</Filter>
</ClCompile>

10
build/sv1.vcxproj
View File

@ -74,7 +74,6 @@
<AssemblerListingLocation>.\..\debug/</AssemblerListingLocation>
<ObjectFileName>.\..\debug/</ObjectFileName>
<ProgramDataBaseFileName>.\..\debug/</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -149,12 +148,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\sc\scselect.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -229,6 +222,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>

3
build/sv1.vcxproj.filters
View File

@ -23,9 +23,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\sc\scselect.cpp">
<Filter>Sources</Filter>
</ClCompile>

4
build/sv2.vcxproj
View File

@ -114,7 +114,6 @@
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -180,6 +179,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>

24
build/tp.sln
View File

@ -1,12 +1,21 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1145
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tp0", "tp0.vcxproj", "{7F47BB01-1600-4ED1-852A-6111116DB1F6}"
ProjectSection(ProjectDependencies) = postProject
{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C} = {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
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 +34,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
{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
{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 = {812304DC-0CC0-4384-9A3B-09A321C67662}
EndGlobalSection
EndGlobal

7
build/tp0.vcxproj
View File

@ -150,7 +150,6 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib02.cpp" />
<ClCompile Include="..\src\tp\tp0.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -264,6 +263,12 @@
<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>

3
build/tp0.vcxproj.filters
View File

@ -30,9 +30,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\tp\tp0.cpp">
<Filter>Sources</Filter>
</ClCompile>

6
build/ve.sln
View File

@ -49,6 +49,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvaga", "xvaga.vcxproj", "{
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -123,6 +125,10 @@ Global
{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
{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

3
build/ve0.vcxproj
View File

@ -217,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>
<ProjectReference Include="lilib.vcxproj">
<Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
</ProjectReference>

15
build/ve1.vcxproj
View File

@ -156,13 +156,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp" />
<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\lv\lvlib.cpp" />
<ClCompile Include="..\src\ve\ve1.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -266,11 +259,13 @@
<BmpCompiler Include="..\src\ve\fattacc.bmp" />
<BmpCompiler Include="..\src\ve\fattura.bmp" />
</ItemGroup>
<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>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
</ProjectReference>
@ -282,7 +277,7 @@
<Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="campo.rc" />
</ItemGroup>

6
build/ve1.vcxproj.filters
View File

@ -30,12 +30,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\ve1.cpp">
<Filter>Sources</Filter>
</ClCompile>

10
build/ve2.vcxproj
View File

@ -156,13 +156,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\src\ca\calib02.cpp" />
<ClCompile Include="..\src\cg\cglib01.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\cg\cgsaldac.cpp" />
<ClCompile Include="..\src\db\dblib.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -311,6 +304,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>

6
build/ve2.vcxproj.filters
View File

@ -21,9 +21,6 @@
<ClCompile Include="..\src\ca\calib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\mg\mglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
@ -69,9 +66,6 @@
<ClCompile Include="..\src\ve\ve2800.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\ve\ve2.h">

5
build/ve3.vcxproj
View File

@ -152,8 +152,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\ba\ba8500.cpp" />
<ClCompile Include="..\src\cg\cglib01.cpp" />
<ClCompile Include="..\src\cg\cglib02.cpp" />
<ClCompile Include="..\src\ve\ve3.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -201,6 +199,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="lilib.vcxproj">
<Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
</ProjectReference>

6
build/ve3.vcxproj.filters
View File

@ -18,12 +18,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib02.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\ve3.cpp">
<Filter>Sources</Filter>
</ClCompile>

6
build/ve4.vcxproj
View File

@ -176,6 +176,12 @@
<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>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

9
build/ve5.vcxproj
View File

@ -149,12 +149,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\ve\ve5.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -218,6 +212,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="lilib.vcxproj">
<Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
</ProjectReference>

3
build/ve5.vcxproj.filters
View File

@ -15,9 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cgsaldac.cpp">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\ve5.cpp">
<Filter>Sources</Filter>
</ClCompile>

3
build/ve6.vcxproj
View File

@ -265,6 +265,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="lilib.vcxproj">
<Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
</ProjectReference>

3
build/ve8.vcxproj
View File

@ -195,6 +195,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="lilib.vcxproj">
<Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
</ProjectReference>

21
build/vedoc.vcxproj
View File

@ -115,25 +115,6 @@
</Xdcmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib01.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\cg\cglib03.cpp" />
<ClCompile Include="..\src\cg\cgpagame.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\ve\clifor.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\db\dblib.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -218,13 +199,13 @@
<ClInclude Include="..\src\cg\cg2103.h" />
<ClInclude Include="..\src\cg\cglib01.h" />
<ClInclude Include="..\src\cg\cgpagame.h" />
<ClInclude Include="..\src\ve\clifor.h" />
<ClInclude Include="..\src\db\dblib.h" />
<ClInclude Include="..\src\pr\prlib.h" />
<ClInclude Include="..\src\ve\sconti.h" />
<ClInclude Include="..\src\sv\svlib01.h" />
<ClInclude Include="..\src\sv\svlib09.h" />
<ClInclude Include="..\src\ve\velib.h" />
<ClInclude Include="..\src\ve\velib05.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="lilib.vcxproj">

24
build/vedoc.vcxproj.filters
View File

@ -11,15 +11,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\cg\cglib01.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cgpagame.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\clifor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\mg\mglib01.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -59,9 +50,6 @@
<ClCompile Include="..\src\sv\svlib09.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\cg\cglib03.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\ve\velib04.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -76,15 +64,9 @@
<ClInclude Include="..\src\cg\cgpagame.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\ve\clifor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\ve\sconti.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\db\dblib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\pr\prlib.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -97,5 +79,11 @@
<ClInclude Include="..\src\ve\velib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\db\dblib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\ve\velib05.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

136
src/cg/cglib.h
View File

@ -36,10 +36,12 @@
#include <rmoviva.h>
#include <pconti.h>
#include <comuni.h>
#include <clifo.h>
#include <clifo.h>
#include <cfven.h>
#include <occas.h>
#include <indsp.h>
#include <rcausali.h>
#include <causali.h>
#include <occas.h>
#include <partite.h>
#include <scadenze.h>
#include <pagsca.h>
@ -1373,4 +1375,134 @@ public:
virtual ~TMovimentoPN() {}
};
// utility
bool fe_decode_cofi(const TString& cofi, char& sex_nasc, TDate& dt_nasc, TString& com_nasc);
///////////////////////////////////////////////////////////
// TAnagrafica
///////////////////////////////////////////////////////////
class TAnagrafica : public TObject
{
char _tipo; // F o G
char _sociounico;
TString4 _stato_paiv;
TString _cofi, _paiv, _cofiest;
TString80 _ragsoc;
TString4 _com_nasc, _com_res;
TString80 _loc_res, _ind_res, _via_res;
TString16 _civ_res, _cap_res;
TDate _data_nasc;
int _allegato, _stato_estero, _stato_nasc;
TAnagrafica& operator =(const TAnagrafica&) { CHECK(false, "Can't copy TAnagrafica"); }
TAnagrafica(const TAnagrafica&) { CHECK(false, "Can't copy TAnagrafica"); }
protected:
void build_ind_res(const TRectype& rec, const char* ind, const char* civ);
void split_ragsoc();
public:
virtual bool ok() const { return _tipo == 'F' || _tipo == 'G'; }
bool fisica() const { return _tipo == 'F'; }
bool giuridica() const { return _tipo == 'G'; }
const TString& codice_fiscale() const { return _cofi; }
const TString& codice_fiscale_estero() const { return _cofiest; }
const TString& partita_IVA() const { return _paiv; }
const TString& stato_partita_IVA() const;
const TString& ragione_sociale() const;
const TString& cognome() const;
const TString& nome() const;
char sesso() const { CHECK(fisica(), "Solo sesso fisico!"); return (_cofi[9] >= '4') ? 'F' : 'M'; }
const TDate& data_nascita() const { return _data_nasc; }
bool italiano() const;
bool estero() const { return !italiano(); }
bool estero_CEE() const;
bool estero_non_CEE() const { return estero() && !estero_CEE(); }
const TString& stato_estero_UNICO() const;
int inserimento_in_allegato() const { return _allegato; }
char is_black_list(const TDate& datareg) const;
const char sociounico() const { return _sociounico; }
const TString& comune_nascita() const;
const TString& provincia_nascita() const;
const TString& codice_comune_residenza() const { return estero() ? EMPTY_STRING : _com_res; }
const TString& comune_residenza() const;
const TString& provincia_residenza() const;
const TString& stato_residenza_ISO() const;
const TString& localita_residenza() const { return _loc_res; }
const TString& indirizzo_residenza() const { return _ind_res; }
const TString& via_residenza() const { return _via_res; }
const TString& civico_residenza() const { return _civ_res; }
const TString& CAP_residenza() const { return _cap_res; }
bool init(const TRectype& rec);
bool init(int num, const TString& codice);
bool init(int num, long codice);
bool init(int num, char tipo, long codice);
bool init(char tipocf, long codice, const TString& ocfpi);
TAnagrafica() : _tipo('\0') {}
TAnagrafica(int lognum, const TString& codice) { init(lognum, codice); }
TAnagrafica(int lognum, long codice) { init(lognum, codice); }
TAnagrafica(int lognum, char tipo, long codice) { init(lognum, tipo, codice); }
TAnagrafica(char tipo, long codice, const TString& ocfpi) { init(tipo, codice, ocfpi); }
TAnagrafica(const TRectype& rec) { init(rec); }
};
class TOccasionale : public TRectype
{
public:
const TString& codice() const { return get(OCC_CFPI); }
TRectype& operator = (const TRectype& r);
TOccasionale& operator = (const TOccasionale& r);
TOccasionale();
TOccasionale(const TRectype& r);
TOccasionale(const TOccasionale& r);
virtual ~TOccasionale();
};
class TCli_for : public TMultiple_rectype
{
TRectype _ven_rec;
TRectype _letint;
TDate _last_data;
bool _use_lettere;
bool _extended;
bool _lettera_found;
protected:
virtual int write_rewrite(TBaseisamfile& f, bool re = FALSE) const;
void init();
public:
bool read_lettera(const TDate & data, bool extended = false);
bool occasionale() const { return get_bool(CLI_OCCAS); }
TRectype& vendite() const;
bool use_lettere() const { return _use_lettere; }
const TRectype & lettera() const { return _letint; }
const TRectype & indsp(const int codindsp) const;
char tipo() const { return get_char(CLI_TIPOCF); }
long codice() const { return get_long(CLI_CODCF); }
bool ok() const { return !empty(); }
virtual int read(const TRectype& rec, word op = _isequal, word lockop = _nolock);
int read(char tipo, long codice, word op = _isequal, word lockop = _nolock);
virtual int remove(TBaseisamfile& f) const;
// void cli2doc(TDocumento& doc); in velib03
const TString& find_listino_al(const TDate& datadoc) const;
const TString & get_iban();
TToken_string & get_ban_pres(int nprog = 1);
TCli_for(char tipo = ' ', long codice = 0L);
TCli_for(const TRectype & rec);
TCli_for(const TCli_for & c);
virtual ~TCli_for();
};
#endif

931
src/cg/cglib07.cpp Normal file
View File

@ -0,0 +1,931 @@
#include <applicat.h>
#include <lffiles.h>
#include <modaut.h>
#include <recarray.h>
#include <validate.h>
#include "cglib.h"
#include "../ve/condv.h"
#include "../li/letint.h"
#include "../cg/cfban.h"
#include <alleg.h>
#include <anagr.h>
#include <effetti.h>
#include <anafis.h>
#include <comuni.h>
#
#include <nditte.h>
bool fe_decode_cofi(const TString& cofi, char& sex_nasc, TDate& dt_nasc, TString& com_nasc)
{
if (cofi.len() != 16 || !cf_check("", cofi))
return false;
const TFixed_string wm = "ABCDEHLMPRST"; // Controllo data di nascita
int anno = atoi(cofi.mid(6, 2));
anno += anno < 25 ? 2000 : 1900;
const int mese = wm.find(cofi[8]) + 1;
int giorno = atoi(cofi.mid(9, 2));
if (giorno > 40)
{
giorno -= 40;
sex_nasc = 'F';
}
else
sex_nasc = 'M';
com_nasc = cofi.mid(11, 4);
return true;
}
///////////////////////////////////////////////////////////
// TAnagrafica
///////////////////////////////////////////////////////////
static bool is_stato_estero(const TString& codcom)
{
return codcom.full() && codcom.match("Z[0-9][0-9][0-9]");
}
static const TString& comune_di(const TString& codcom, int stato)
{
if (codcom.blank() || codcom.len() != 4)
return EMPTY_STRING;
TString8 key;
if (stato > 0)
key.format("%03d", stato);
key << '|' << codcom;
return cache().get(LF_COMUNI, key, COM_DENCOM);
}
static const TString& provincia_di(const TString& codcom)
{
if (codcom.blank() || codcom.len() != 4)
return EMPTY_STRING;
TString& prov = get_tmp_string();
if (is_stato_estero(codcom))
prov = "EE";
else
{
TString8 key; key << '|' << codcom;
prov = cache().get(LF_COMUNI, key, COM_PROVCOM);
if (prov.len() > 2) prov = "RM";
}
return prov;
}
const TString& TAnagrafica::comune_nascita() const
{
if (is_stato_estero(_com_nasc))
{
const TString& c = comune_di(_com_nasc, 0);
if (c.full())
return c;
}
if (_stato_nasc > 0)
{
TString4 u; u.format("%03d", _stato_nasc);
const TString& s = cache().get("%STA", u, "S0");
if (s.full())
return s;
}
return comune_di(_com_nasc, _stato_nasc);
}
const TString& TAnagrafica::provincia_nascita() const
{
if (_stato_nasc > 0 || is_stato_estero(_com_nasc))
return get_tmp_string() = "EE";
return provincia_di(_com_nasc);
}
const TString& TAnagrafica::comune_residenza() const
{
const TString& cr = comune_di(_com_res, _stato_estero);
if (cr.full())
return cr;
return _loc_res;
}
const TString& TAnagrafica::provincia_residenza() const
{
if (estero())
return get_tmp_string() = "EE";
return provincia_di(_com_res);
}
const TString& TAnagrafica::stato_residenza_ISO() const
{
if (italiano())
return get_tmp_string() = "IT";
else
{
TString4 u; u.format("%03d", _stato_estero);
return cache().get("%STA", u, "S10");
}
}
void TAnagrafica::build_ind_res(const TRectype& rec, const char* ind, const char* civ)
{
_via_res = _ind_res = rec.get(ind);
_civ_res = rec.get(civ);
if (_civ_res.blank())
{
const int comma = _via_res.rfind(',');
if (comma > 0 && _via_res.len() - comma <= 8)
{
_civ_res = _via_res.mid(comma + 1); _civ_res.trim();
_via_res.cut(comma); _via_res.trim();
}
}
if (_via_res.full())
{
TString80 ind = _via_res;
if (_civ_res.full())
ind << ", " << _civ_res;
ind.strip_double_spaces();
TParagraph_string s(ind, 40);
_ind_res = s.get(0); // prende solo i primi 40 caratteri dell'indirizzo completo
}
// Sistema persone senza codice stato, ma residenti in comune estero
if (_stato_estero <= 0 && is_stato_estero(_com_res))
{
const TString80 naz = comune_di(_com_res, 0);
TString query; query.format("USE %%STA KEY 2\nFROM S0=%c\nTO S0=%c", naz[0], naz[0]);
TISAM_recordset sta(query);
double dBest = 0;
int nBest = 0;
for (bool ok = sta.move_first(); ok; ok = sta.move_next())
{
const double s = xvt_str_fuzzy_compare(naz, sta.get("S0").as_string());
if (s > dBest)
{
nBest = sta.get("CODTAB").as_int();
dBest = s;
if (dBest >= 1.0)
break;
}
}
if (dBest > 0.8)
_stato_estero = nBest;
}
}
const TString& TAnagrafica::ragione_sociale() const
{
if (fisica())
{
TString& rs = get_tmp_string();
rs = _ragsoc;
return rs.strip_double_spaces();
}
return _ragsoc;
}
const TString& TAnagrafica::cognome() const
{
TString& c = get_tmp_string();
c = _ragsoc.left(30);
return c.trim();
}
const TString& TAnagrafica::nome() const
{
CHECK(fisica(), "Non chiedere nome giuridico!");
TString& c = get_tmp_string();
c = _ragsoc.mid(30, 20);
return c.trim();
}
bool TAnagrafica::italiano() const
{
return _stato_estero == 0 && !is_stato_estero(_com_res);
}
bool TAnagrafica::estero_CEE() const
{
return estero() && cache().get("%SCE", stato_residenza_ISO(), "B0");
}
const TString& TAnagrafica::stato_estero_UNICO() const
{
if (_stato_estero <= 0)
return EMPTY_STRING;
TString4 u; u.format("%03d", _stato_estero);
const TString& cod = cache().get("%STA", u, "S8"); // S8=UNICO S9=ISTAT S10=ISO
if (cod.len() == 3)
return cod;
return get_tmp_string() = u;
}
const TString& TAnagrafica::stato_partita_IVA() const
{
TString& str = get_tmp_string();
if (_stato_paiv.full())
str = _stato_paiv;
else if (italiano())
{
str = "IT";
}
return str;
}
char TAnagrafica::is_black_list(const TDate& datareg) const
{
char is_black = ' ';
if (_stato_estero > 0)
{
TString4 u; u.format("%03d", _stato_estero);
const TRectype& sta = cache().get("%STA", u);
if (sta.get_bool("B1")) // San Marino
{
if (datareg.date2ansi() < TDate(24, 2, 2014))
is_black = 'M';
}
else
{
if (sta.get_bool("B0")) // Black List
is_black = 'S';
}
}
return is_black;
}
void TAnagrafica::split_ragsoc()
{
if (_tipo == 'F')
{
if (nome().blank())
{
const int space = _ragsoc.find(' ');
if (space >= 4)
{
TString80 nom = _ragsoc.mid(space + 1);
nom.cut(20);
_ragsoc.cut(space);
_ragsoc.insert(nom, 30);
}
}
}
else
_ragsoc.strip_double_spaces();
_ragsoc.replace('"', '\''); // gli " creano casini nel csv
}
bool TAnagrafica::init(const TRectype& rec)
{
_tipo = '\0';
_sociounico = '\0';
_stato_estero = _stato_nasc = 0;
_allegato = 0;
_ragsoc.cut(0);
if (rec.empty())
return false;
bool is_firm = false;
switch (rec.num())
{
case LF_OCCAS:
_cofi = rec.get(OCC_COFI);
_paiv = rec.get(OCC_PAIV);
if (_cofi.blank() || _paiv.blank())
{
const TString& codice = rec.get(OCC_CFPI);
if (_cofi.blank() && cf_check("", codice))
_cofi = codice;
if (_paiv.blank() && pi_check("", codice))
_paiv = codice;
}
_ragsoc = rec.get(OCC_RAGSOC);
_data_nasc = rec.get(OCC_DNASC);
_stato_nasc = rec.get_int(OCC_STATONASC);
_com_nasc = rec.get(OCC_COMNASC);
_stato_estero = rec.get_int(OCC_STATO);
_com_res = rec.get(OCC_COM);
_loc_res = rec.get(OCC_LOCALITA);
_cap_res = rec.get(OCC_CAP);
build_ind_res(rec, OCC_INDIR, OCC_CIV);
if (_com_nasc.full() || (!_stato_estero && !real::is_natural(_cofi) || cf_check("", _cofi)))
{
_tipo = 'F';
if (_cofi.full() && (!_data_nasc.ok()) || _com_nasc.blank())
{
char sex = 'X';
fe_decode_cofi(_cofi, sex, _data_nasc, _com_nasc);
}
}
else
_tipo = 'G';
_allegato = _tipo == 'F' ? 6 : 2;
break;
case LF_ANAG:
_tipo = rec.get_char(ANA_TIPOA);
_ragsoc = rec.get(ANA_RAGSOC);
_cofi = rec.get(ANA_COFI);
_cofiest = rec.get(ANA_COFIEST);
_paiv = rec.get(ANA_PAIV);
_stato_paiv = rec.get(ANA_STATOPAIV);
if (_ragsoc.starts_with("EYCK"))
int zingara = 1;
// Comune di residenza fiscale o domicilio
_stato_estero = rec.get_int(ANA_STATORES);
_com_res = rec.get(ANA_COMRF);
if (_com_res.empty())
_com_res = rec.get(ANA_COMRES);
build_ind_res(rec, ANA_INDRES, ANA_CIVRES);
_cap_res = rec.get(ANA_CAPRES);
// Dati di nascita persone fisiche
if (_tipo == 'F' || (italiano() && isalpha(_cofi[0])))
{
const long codana = rec.get_long(ANA_CODANAGR);
if (codana > 0)
{
const TRectype& anafis = cache().get(LF_ANAGFIS, codana);
_data_nasc = anafis.get(ANF_DATANASC);
_stato_nasc = anafis.get_int(ANF_STATONASC);
_com_nasc = anafis.get(ANF_COMNASC);
if ((!_data_nasc.ok() || _com_nasc.blank()) && cf_check("", _cofi))
{
char sex = 'X';
fe_decode_cofi(_cofi, sex, _data_nasc, _com_nasc);
}
}
}
else
_tipo = 'G';
break;
case LF_NDITTE:
{
const char tipoa = rec.get_char(NDT_TIPOA);
const long codana = rec.get_long(NDT_CODANAGR);
const bool good = init(LF_ANAG, tipoa, codana);
_sociounico = rec.get_char(NDT_SOCIOUNICO);
if (_tipo == 'G')
{
_ragsoc = rec.get(NDT_RAGSOC);
split_ragsoc();
}
return good;
}
break;
case LF_CLIFO:
_allegato = rec.get_int(CLI_ALLEG);
if (_allegato == 4)
{
const long ca = rec.get_long(CLI_CODALLEG);
if (ca > 0)
return init(rec.get_char(CLI_TIPOCF), ca, EMPTY_STRING);
}
_tipo = ' '; // Non faccio assunzioni sulla persona fisica
is_firm = (rec.get_char(CLI_TIPOPERS) == 'G' || rec.get_char(CLI_TIPOAPER) == 'G' || _allegato == 7) && (_allegato != 6);
if (!is_firm && rec.get(CLI_PAIV).full())
{
TString80 rs = rec.get(CLI_RAGSOC); rs.lower();
const char* soc[] = { "&", "azienda ", " sas ", " s.a.s.", " snc", " s.n.c.", " srl", " s.r.l.",
"coop.", "cooperativa", " s.n.c.", " srl", " s.r.l.", " s.p.a", " s.a.", NULL };
for (int s = 0; soc[s] && !is_firm; s++)
is_firm = rs.find(soc[s]) > 0;
if (!is_firm)
is_firm = rs.ends_with(" spa") || (rs.find(" di ") > 15); // Shopping Point di Karoline Reiner
}
if (!is_firm)
{
bool has_cofi = false; // Codice fiscale alfanumerico?
const TString& cli_cofi = rec.get(CLI_COFI);
if (cli_cofi.full() && isalpha(cli_cofi[0]))
has_cofi = cf_check(rec.get(CLI_STATOPAIV), cli_cofi);
// Persona Fisica?
if (rec.get_char(CLI_TIPOAPER) == 'F' || rec.get_date(CLI_DATANASC).ok() || has_cofi || _allegato == 6)
{
const long cod = rec.get_long(CLI_CODANAGPER); // Percipiente?
if (cod > 0)
init(LF_ANAG, 'F', cod);
_tipo = 'F';
_data_nasc = rec.get_date(CLI_DATANASC);
if (!_data_nasc.ok() && has_cofi)
{
char sex = 'X';
fe_decode_cofi(cli_cofi, sex, _data_nasc, _com_nasc);
}
if (_com_nasc.blank())
{
_com_nasc = rec.get(CLI_COMNASC);
if (_com_nasc.blank() && has_cofi)
{
char sex = 'X';
fe_decode_cofi(cli_cofi, sex, _data_nasc, _com_nasc);
}
}
if (_stato_nasc <= 0)
_stato_nasc = rec.get_int(CLI_STATONASC);
if (_com_nasc.blank() && _stato_nasc > 0)
{
TString4 sn; sn.format("%03d", _stato_nasc);
const TString80 stato = cache().get("%STA", sn, "S0");
TISAM_recordset comuni("USE COMUNI\nFROM COM=Z\nTO STATO=\"0~\"");
double best = 0.8;
for (bool ok = comuni.move_first(); ok; ok = comuni.move_next())
{
const TString& desc = comuni.get(COM_DENCOM).as_string();
const double score = xvt_str_fuzzy_compare_ignoring_case(desc, stato);
if (score > best)
{
best = score;
_stato_nasc = 0;
_com_nasc = comuni.get(COM_COM).as_string();
if (best >= 1.0)
break;
}
}
}
}
}
// Assegno codice fiscale e partita IVA se validi, altrimenti mantengo quelli dell'anagrafica
if (rec.get(CLI_COFI).full())
_cofi = rec.get(CLI_COFI);
if (rec.get(CLI_PAIV).full())
{
_paiv = rec.get(CLI_PAIV);
_stato_paiv = rec.get(CLI_STATOPAIV);
}
if (_allegato != 5 && _allegato != 9)
{
if (_stato_paiv.blank() || _stato_paiv == "IT")
{
// Ci sono anagrafiche con codice fiscale numerico e partita IVA vuota!
// I codici fiscali che cominciano per 8 e 9 sono le associazioni riconosciute e non, rispettivamente.
if (_paiv.blank() && pi_check(_stato_paiv, _cofi) && _cofi[0] < '8')
_paiv = _cofi;
if (_paiv.len() == 11 && pi_check(_stato_paiv, _paiv) && (_paiv[0] == '8' || _paiv[0] == '9'))
{
if (_cofi.blank())
_cofi = _paiv;
_paiv.cut(0);
}
}
}
// Prevale sempre la ragione sociale del cliente: "Il cliente ha sempre ragione".
_ragsoc = rec.get(CLI_RAGSOC);
_loc_res = rec.get(CLI_LOCCF);
_cap_res = rec.get(CLI_CAPCF);
_stato_estero = rec.get_int(CLI_STATOCF);
if (_stato_estero <= 0 && (_allegato == 5 || _allegato == 9)) // Estero CEE o extra-CEE
_stato_estero = -1; // Stato estero ignoto
_com_res = rec.get(CLI_COMCF);
build_ind_res(rec, CLI_INDCF, CLI_CIVCF);
if (_tipo != 'F' && _tipo != 'G')
{
switch (_allegato)
{
case 6: _tipo = 'F'; break; // Privato
case 7: _tipo = 'G'; break; // Ente pubblico
case 8: _tipo = 'G'; break; // Fallimento
default:
if (_com_nasc.full())
_tipo = 'F';
else
{
_tipo = rec.get_char(CLI_TIPOPERS);
if (_tipo != 'F' || is_firm)
_tipo = 'G';
}
break;
}
}
if (_tipo == 'G' || _ragsoc.len() <= 30)
split_ragsoc();
break;
case LF_MOV:
return init(rec.get_char(MOV_TIPO), rec.get_long(MOV_CODCF), rec.get(MOV_OCFPI));
case LF_ALLEG:
return init(rec.get_char(ALL_TIPOCF), rec.get_long(ALL_CODCF), rec.get(ALL_OCFPI));
case LF_EFFETTI:
return init(rec.get_char(EFF_TIPOCF), rec.get_long(EFF_CODCF), EMPTY_STRING);
case LF_PERC:
return init(LF_ANAG, rec.get_char("TIPOA"), rec.get_long("CODANAGR"));
default:
CHECKD(false, "Record non valido per TAnagrafica ", rec.num());
break;
}
split_ragsoc();
return _tipo == 'F' || _tipo == 'G';
}
bool TAnagrafica::init(int num, const TString& codice)
{
return init(cache().get(num, codice));
}
bool TAnagrafica::init(int num, long codice)
{
return init(cache().get(num, codice));
}
bool TAnagrafica::init(int num, char tipo, long codice)
{
TString8 key; key.format("%c|%ld", tipo, codice);
return init(cache().get(num, key));
}
bool TAnagrafica::init(char tipocf, long codice, const TString& ocfpi)
{
bool done = false;
if (ocfpi.full())
done = init(LF_OCCAS, ocfpi);
if (!done)
{
CHECK(tipocf == 'C' || tipocf == 'F', "Tipo cli/for non valido");
CHECKD(codice > 0, "Codice cli/for non valido", codice);
done = init(LF_CLIFO, tipocf, codice);
}
return done;
}
TOccasionale::TOccasionale() : TRectype(LF_OCCAS)
{ }
TOccasionale::TOccasionale(const TRectype& r) : TRectype(r)
{ }
TOccasionale::TOccasionale(const TOccasionale& r) : TRectype(r)
{ }
TRectype& TOccasionale::operator=(const TRectype& r)
{
return TRectype::operator=(r);
}
TOccasionale& TOccasionale::operator=(const TOccasionale& r)
{
TRectype::operator=(r);
return *this;
}
TOccasionale::~TOccasionale()
{ }
int TCli_for::write_rewrite(TBaseisamfile& f, bool re) const
{
int err = TMultiple_rectype::write_rewrite(f, re);
if (err == NOERR)
{
TLocalisamfile v(LF_CFVEN);
const TRectype& v_rec = vendite();
err = v.write(v_rec);
if (err == _isreinsert)
err = v.write(v_rec);
}
return err;
}
TRectype& TCli_for::vendite() const
{
const char t = tipo();
const long c = codice();
if (_ven_rec.empty() || t != _ven_rec.get_char(CFV_TIPOCF) || c != _ven_rec.get_long(CFV_CODCF))
{
TLocalisamfile v(LF_CFVEN);
v.put(CFV_TIPOCF,t);
v.put(CFV_CODCF, c);
if (v.read() == NOERR)
((TCli_for*)this)->_ven_rec = v.curr();
}
return (TRectype &) _ven_rec;
}
bool TCli_for::read_lettera(const TDate& data, bool extended)
{
if (use_lettere())
{
if (data != _last_data || _extended != extended)
{
_letint.zero();
TRelation r(LF_LETINT);
TRectype to(r.curr());
to.put(LETINT_CODCLI, codice());
to.put(LETINT_ANNO, data.year());
TRectype from(to);
from.put(LETINT_ANNO, data.year() - 1);
TCursor c(&r, "", 2, &from, &to);
const int items = c.items();
if (items > 0)
{
TDate dal;
TDate al(31, 12, data.year());
for (long pos = items - 1; pos >= 0L; pos--)
{
c = pos;
const int tipo = c.curr().get_int(LETINT_TIPOOP);
if (tipo == 3) // Nel periodo
{
dal = c.curr().get_date(LETINT_DAL);
al = c.curr().get_date(LETINT_AL);
}
else if(tipo == 2)
{
dal = c.curr().get_date(LETINT_DAL);
if (c.pos() < items - 1)
{
++c;
const int tipo_next = c.curr().get_int(LETINT_TIPOOP);
if (tipo_next == 3 || tipo_next == 2)
al = c.curr().get_date(LETINT_DAL);
else
al = c.curr().get_date(LETINT_VSDATA);
--c;
}
}
else
{
dal = c.curr().get_date(LETINT_VSDATA);
if (c.pos() < items - 1)
{
++c;
const int tipo_next = c.curr().get_int(LETINT_TIPOOP);
if (tipo_next == 3)
al = c.curr().get_date(LETINT_DAL);
else
al = c.curr().get_date(LETINT_VSDATA);
--c;
}
}
if (dal <= data)
{
_letint = c.curr();
break;
}
}
_lettera_found = !_letint.empty();
if (_lettera_found && !extended)
_lettera_found = data <= al;
}
_last_data = data;
_extended = extended;
}
}
return _lettera_found;
}
const TRectype & TCli_for::indsp(const int codindsp) const
{
TToken_string key = tipo();
key.add(codice());
key.add(codindsp);
const TRectype & recindsp = cache().get(LF_INDSP, key);
return recindsp;
}
int TCli_for::read(const TRectype & rec, word op, word lockop)
{
_ven_rec.zero();
int err = TMultiple_rectype::read(rec, op, lockop);
_last_data = botime;
return err;
}
int TCli_for::read(char tipo, long codice, word op, word lockop)
{
int err = NOERR;
_ven_rec.zero();
zero();
if (tipo > ' ' && codice > 0L)
{
put(CLI_TIPOCF, tipo);
put(CLI_CODCF, codice);
err = TMultiple_rectype::read(op, lockop);
}
_last_data = botime;
return err;
}
int TCli_for::remove(TBaseisamfile& f) const
{
TLocalisamfile v(LF_CFVEN);
const int err = vendite().remove(v);
if (err != NOERR && err != _iskeynotfound)
return err;
return TMultiple_rectype::remove(f);
}
void TCli_for::init()
{
// _tipo = new TRecfield(*this, CLI_TIPOCF);
// _codice = new TRecfield(*this, CLI_CODCF);
// _ven_tipo = new TRecfield(_ven_rec, CFV_TIPOCF);
// _ven_codice = new TRecfield(_ven_rec, CFV_CODCF);
_use_lettere = main_app().has_module(LIAUT, CHK_DONGLE);
}
const TString& TCli_for::find_listino_al(const TDate& datadoc) const
{
const bool gest_list_catven = ini_get_bool(CONFIG_DITTA, "ve", "GESLISCV", false, 1);
const TRectype& v = vendite();
TString4 listino = v.get(CFV_CODLIST);
TToken_string key_condv;
key_condv = "L";
if (gest_list_catven)
key_condv.add(v.get(CFV_CATVEN));
//se il cliente ha un listino specificato -> va usato (previo controllo validità)
while (listino.full())
{
key_condv.add(listino, 4);
const TRectype& rec_condv = cache().get(LF_CONDV, key_condv);
const TDate inizio_validita = rec_condv.get_date(CONDV_VALIN);
const TDate fine_validita = rec_condv.get_date(CONDV_VALFIN);
// usa il listino indicato sul cliente solo se è valido per la data del documento
if (datadoc >= inizio_validita && (datadoc <= fine_validita || !fine_validita.ok()))
break;
listino = rec_condv.get(CONDV_CODLISSUCC);
}
return get_tmp_string() = listino;
}
/*void TCli_for::cli2doc(TDocumento& doc)
{
const TRectype& v = vendite();
doc.put(DOC_CODVAL, get(CLI_CODVAL));
doc.put(DOC_CODLIN, get(CLI_CODLIN));
doc.put(DOC_CODPAG, get(CLI_CODPAG));
TToken_string key;
key.add(get(CLI_TIPOCF));
key.add(get(CLI_CODCF));
key.add("V");
key.add("1");
const TRectype& cfban = cache().get(LF_CFBAN, key);
if (cfban.empty())
{
doc.put(DOC_CODABIA, get(CLI_CODABI));
doc.put(DOC_CODCABA, get(CLI_CODCAB));
doc.put(DOC_IBAN, get(CLI_IBAN));
}
else
{
doc.put(DOC_CODABIA, cfban.get(CFBAN_ABI));
doc.put(DOC_CODCABA, cfban.get(CFBAN_CAB));
doc.put(DOC_IBAN, cfban.get(CFBAN_IBAN));
}
// Trasforma chiave da Vostra a Nostra banca
key.add("N", 2);
const TRectype& cfbanpr = cache().get(LF_CFBAN, key);
// Setta i campi che appartengono al file LF_CFVEN
if (cfbanpr.empty())
{
doc.put(DOC_CODABIP, v.get(CFV_CODABIPR));
doc.put(DOC_CODCABP, v.get(CFV_CODCABPR));
}
else
{
doc.put(DOC_CODABIP, cfbanpr.get(CFBAN_ABI));
doc.put(DOC_CODCABP, cfbanpr.get(CFBAN_CAB));
doc.put(DOC_PROGBNP, cfbanpr.get(CFBAN_PROGPR));
}
doc.put(DOC_RAGGR, v.get(CFV_RAGGDOC));
doc.put(DOC_RAGGREFF, v.get(CFV_RAGGEFF));
doc.put(DOC_CODINDSP, v.get(CFV_CODINDSP));
doc.put(DOC_CODAG, v.get(CFV_CODAG));
doc.put(DOC_CODAGVIS, v.get(CFV_CODAG1));
doc.put(DOC_CODSPMEZZO, v.get(CFV_CODSPMEZZO));
doc.put(DOC_CODPORTO, v.get(CFV_CODPORTO));
doc.put(DOC_CODNOTESP1, v.get(CFV_CODNOTESP1));
doc.put(DOC_CODNOTESP2, v.get(CFV_CODNOTESP2));
doc.put(DOC_CODNOTE, v.get(CFV_CODNOTE));
doc.put(DOC_CODVETT1, v.get(CFV_CODVETT1));
doc.put(DOC_CODVETT2, v.get(CFV_CODVETT2));
doc.put(DOC_CODVETT3, v.get(CFV_CODVETT3));
doc.put(DOC_PERCSPINC, v.get(CFV_PERCSPINC));
doc.put(DOC_ADDBOLLI, v.get(CFV_ADDBOLLI));
doc.put(DOC_CATVEN, v.get(CFV_CATVEN));
const int alleg = get_int(CLI_ALLEG);
const bool split_payment = doc.get_date(DOC_DATADOC).year() >= 2015 && get_bool(CLI_SPLITPAY);
doc.put(DOC_LIQDIFF, !split_payment && alleg == 7 && ini_get_bool(CONFIG_DITTA, "cg", "GesLiqDiff") ? "X" : "");
//listino: deve essere attiva la gestione listini nella ditta
const bool gest_listini = ini_get_bool(CONFIG_DITTA, "ve", "GES", false, 1);
if (gest_listini)
{
const TDate datadoc = doc.get_date(DOC_DATADOC);
const TString& listino = find_listino_al(datadoc);
doc.put(DOC_CODLIST, listino);
}
doc.put(DOC_ZONA, v.get(CFV_CODZONA));
doc.put(DOC_RAGGR, v.get(CFV_RAGGDOC));
//aggiungere gestione spese e bolli???
doc.put(DOC_CODPORTO, v.get(CFV_CODPORTO));
}
const TString& TCli_for::get_iban()
{
TString & iban = get_tmp_string(30);
TToken_string key;
key.add(tipo());
key.add(codice());
key.add("V");
key.add(1);
const TRectype& cfban = cache().get(LF_CFBAN, key);
if (!cfban.empty())
{
const TString& abi_cf = cfban.get(CFBAN_ABI);
const TString& cab_cf = cfban.get(CFBAN_CAB);
iban = cfban.get(CFBAN_IBAN);
}
return iban;
}
TToken_string& TCli_for::get_ban_pres(int nprog)
{
TToken_string & ban = get_tmp_string(30);
TToken_string key;
key.add(tipo());
key.add(codice());
key.add("N");
key.add(nprog);
const TRectype& cfban = cache().get(LF_CFBAN, key);
if (!cfban.empty())
{
ban.add(cfban.get(CFBAN_ABI));
ban.add(cfban.get(CFBAN_CAB));
ban.add(cfban.get(CFBAN_PROGPR));
}
return ban;
}*/
TCli_for::TCli_for(char tipo, long codice) : TMultiple_rectype( LF_CLIFO ), _ven_rec(LF_CFVEN),
_letint(LF_LETINT), _use_lettere(false), _lettera_found(false), _extended(false)
{
init();
add_file(LF_INDSP, IND_CODIND);
if (tipo > ' ' && codice > 0L)
read(tipo, codice);
}
TCli_for::TCli_for(const TRectype & rec) : TMultiple_rectype(rec), _ven_rec(LF_CFVEN),
_letint(LF_LETINT), _use_lettere(false), _lettera_found(false), _extended(false)
{
init();
add_file(LF_INDSP, IND_CODIND);
read(rec);
}
TCli_for::TCli_for(const TCli_for & c) : TMultiple_rectype(c), _ven_rec(c._ven_rec),
_letint(LF_LETINT), _use_lettere(false), _lettera_found(false), _extended(false)
{ init(); }
TCli_for::~TCli_for()
{ }

3
src/fp/fp0300.cpp
View File

@ -230,7 +230,8 @@ void TPA_mask::fill()
row.add(rec.get(CFV_CODCF).as_int());
row.add(rec.get("20." CLI_RAGSOC).as_string());
TString rif = get_dest_sdi(rec.get(CFV_TIPOCF).as_string()[0], rec.get(CFV_CODCF).as_int());
TString cod_ind_sped = rec.get(DOC_CODINDSP).as_string();
TString rif = get_dest_sdi(rec.get(CFV_TIPOCF).as_string()[0], rec.get(CFV_CODCF).as_int(), cod_ind_sped);
// Se è ancora vuoto potrebbe essere estero
if(rif.empty())
{

4
src/fp/fplib.h
View File

@ -36,9 +36,9 @@ TString& complete_num_fp(const TCodice_numerazione& codnum, const int numdoc);
bool chiave_paf(const TDocumento& doc, TString& hfatt, TString& bfatt);
bool chiave_paf(const TRectype& doc, TString& hfatt, TString& bfatt);
// Ritorna cod sdi, pec o vuoto. Chiama get_coddest()
TString get_dest_sdi(const char tipocf, const long codcf);
TString get_dest_sdi(char tipocf, long codcf, const TString& cod_ind_sped);
// Valorizza codice sdi e pec in base alle configurazioni del monitor
bool get_coddest(const char tipocf, const long codcf, TString& coddest, TString& pec);
bool get_coddest(char tipocf, long codcf, TString& coddest, TString& pec, const TString& cod_ind_sped);
const TString& tipo_doc_sdi(const TDocumento& doc);
// Controlli comuni

41
src/fp/fplib01.cpp
View File

@ -198,17 +198,31 @@ bool chiave_paf(const TRectype& doc, TString& hfatt, TString& bfatt)
chiave_paf(d, hfatt, bfatt);
return hfatt.full();
}
TString get_dest_sdi(const char tipocf, const long codcf)
TString get_dest_sdi(const char tipocf, const long codcf, const TString& cod_ind_sped)
{
TString codsdi, pec;
get_coddest(tipocf, codcf, codsdi, pec);
get_coddest(tipocf, codcf, codsdi, pec, cod_ind_sped);
return pec.full() ? pec : codsdi;
}
bool get_coddest(const char tipocf, const long codcf, TString& coddest, TString& pec)
bool get_coddest(const char tipocf, const long codcf, TString& coddest, TString& pec, const TString& cod_ind_sped)
{
const TCli_for clifo(tipocf, codcf);
coddest = clifo.vendite().get("PADESTIN");
pec = clifo.get("PEC");
coddest.cut(0);
pec.cut(0);
const TCli_for clifo(tipocf, codcf);
pec = clifo.get("PEC");
if(!cod_ind_sped.empty())
{
TLocalisamfile indsp(LF_INDSP);
indsp.put(IND_TIPOCF, tipocf);
indsp.put(IND_CODCF, codcf);
indsp.put(IND_CODIND, cod_ind_sped);
indsp.read();
coddest = indsp.get(IND_CODDEST);
}
if(coddest.empty())
coddest = clifo.vendite().get("PADESTIN");
const TAnagrafica anag(LF_CLIFO, tipocf, codcf);
if (coddest.empty())
{
@ -1019,13 +1033,13 @@ bool TDoc_fp::initialize(TDocumentoEsteso& doc)
// Controllo se il documento è almeno in stato di stampa
if (doc.stato() < doc.tipo().stato_finale_stampa())
{
log(3, "Il documento non è stato ancora stampato, verrà saltato");
log(3, "Il documento non e' stato ancora stampato, verra' saltato");
return false;
}
#endif
#ifndef DBG
_is_pa = doc.clifor().get_int("ALLEG") == 7;
if (!get_coddest(doc.clifor().tipo(), doc.clifor().codice(), _coddest, _pec))
if (!get_coddest(doc.clifor().tipo(), doc.clifor().codice(), _coddest, _pec, doc.get(DOC_CODINDSP)))
{
log(1, "Impossibile trovare il codice destinatario per la fattura");
return false;
@ -1544,7 +1558,16 @@ bool TDoc_fp::doc_to_paf(TDocumentoEsteso& doc)
TString rifamm = cco(doc).get("S4");
if (rifamm.blank())
rifamm = doc.clifor().vendite().get(CFV_PARIFAMM);
{
TLocalisamfile indsp(LF_INDSP);
indsp.put(IND_TIPOCF, doc.get(DOC_TIPOCF));
indsp.put(IND_CODCF, doc.get(DOC_CODCF));
indsp.put(IND_CODIND, doc.get(DOC_CODINDSP));
indsp.read();
rifamm = indsp.get(IND_RIFAMM);
if(rifamm.blank())
rifamm = doc.clifor().vendite().get(CFV_PARIFAMM);
}
paf0200f.set("P2_RIFAMMINISTR", rifamm);
paf0200f.set("P2_ISCRREASOCIOU", _ditta.sociounico() == 'S' ? "SU" : "SM");
TISAM_recordset unloc("USE UNLOC\nJOIN COMUNI INTO COM==COMCCIAA\nFROM CODDITTA=#DITTA\nTO CODDITTA=#DITTA");

4
src/include/fraction.cpp
View File

@ -122,7 +122,11 @@ void fraction::build_fraction (const char *s)
}
}
n.strip(",.-+/[]");
#ifdef WIN32
sscanf_s(n, "%I64d", &_num);
#else
sscanf_s(n, "%Ld", &_num);
#endif
if (len_periodo > 0)
{
_den = 9;

35
src/include/indsp.h
View File

@ -1,21 +1,24 @@
#ifndef __INDSP_H
#define __INDSP_H
#define IND_TIPOCF "TIPOCF"
#define IND_CODCF "CODCF"
#define IND_CODIND "CODIND"
#define IND_RAGSOC "RAGSOC"
#define IND_INDIR "INDIR"
#define IND_CIV "CIV"
#define IND_LOCALITA "LOCALITA"
#define IND_CAP "CAP"
#define IND_STATO "STATO"
#define IND_COM "COM"
#define IND_PTEL "PTEL"
#define IND_TEL "TEL"
#define IND_PFAX "PFAX"
#define IND_FAX "FAX"
#define IND_IVARID "IVARID"
#define IND_INDIR2 "INDIR2"
#define IND_TIPOCF "TIPOCF"
#define IND_CODCF "CODCF"
#define IND_CODIND "CODIND"
#define IND_RAGSOC "RAGSOC"
#define IND_INDIR "INDIR"
#define IND_CIV "CIV"
#define IND_LOCALITA "LOCALITA"
#define IND_CAP "CAP"
#define IND_STATO "STATO"
#define IND_COM "COM"
#define IND_PTEL "PTEL"
#define IND_TEL "TEL"
#define IND_PFAX "PFAX"
#define IND_FAX "FAX"
#define IND_IVARID "IVARID"
#define IND_INDIR2 "INDIR2"
#define IND_CODDEST "CODDEST"
#define IND_RIFAMM "RIFAMM"
#endif

73
src/include/recset.cpp
View File

@ -515,38 +515,51 @@ TVariant& TRecordset::get_tmp_var() const
const TVariant& TRecordset::get(const char* column_name) const
{
if (*column_name == '#')
return get_var(column_name);
if (*column_name == '#')
return get_var(column_name);
char* colon = (char*)strchr(column_name, ':'); //antica porcata
if (colon != NULL)
{
*colon = '\0';
const int i = find_column(column_name);
*colon = ':';
if (i >= 0)
{
const TString& str = get(i).as_string();
TString subfield; subfield << (colon+1) << '=';
int s = str.find(subfield);
if (s == 0 || (s > 0 && str[s-1] < ' '))
{
s += subfield.len();
const int e = str.find('\n', s);
TVariant& var = get_tmp_var();
var.set(str.sub(s, e));
return var;
}
}
}
else
{
const int i = find_column(column_name);
if (i >= 0)
return get(i);
}
char* colon = (char*)strchr(column_name, ':'); //antica porcata
if (colon != NULL)
{
*colon = '\0';
const int i = find_column(column_name);
*colon = ':';
if (i >= 0)
{
const TString& str = get(i).as_string();
TString subfield; subfield << (colon + 1) << '=';
int s = str.find(subfield);
if (s == 0 || (s > 0 && str[s - 1] < ' '))
{
s += subfield.len();
const int e = str.find('\n', s);
TVariant& var = get_tmp_var();
var.set(str.sub(s, e));
return var;
}
}
}
else
{
const int i = find_column(column_name);
if (i >= 0)
return get(i);
}
return NULL_VARIANT;
return NULL_VARIANT;
}
const TString& TRecordset::get_string_zerofilled(const char* field, const int zero_filled) const
{
if (zero_filled > 0)
{
TString & str = get_tmp_string(1024);
str = get_string(field);
str.zerofill(zero_filled);
return str;
}
return get_string(field);;
}
const TVariant& TRecordset::get_var(const char* name) const

10
src/include/recset.h
View File

@ -101,7 +101,15 @@ public: // Absolutely needed methods
virtual unsigned int columns() const pure;
virtual const TRecordset_column_info& column_info(unsigned int column) const pure;
virtual const TRecordset_column_info& add_column_info(const TRecordset_column_info& c) {return c; }
virtual const TVariant& get(unsigned int column) const pure;
const TString& get_string(const char* field) const { return get(find_column(field)).as_string(); };
const TString& get_string_zerofilled(const char* field, const int zero_filled) const;
int get_int(const char* field) const { return get(find_column(field)).as_int(); }
long get_long(const char* field) const { return get(find_column(field)).as_int(); }
bool get_bool(const char* field) const { return get(find_column(field)).as_bool(); }
real get_real(const char* field) const { return get(find_column(field)).as_real(); }
TDate get_date(const char* field) const { return get(find_column(field)).as_date(); }
virtual const TVariant& get(unsigned int column) const pure;
virtual const TString_array& variables() const { return _varnames; }
virtual const TVariant& get_var(const char* name) const;

2
src/include/strings.h
View File

@ -183,6 +183,8 @@ public:
TString& trim();
// @cmember Aggiunge spazi a destra fino alla dimensione indicata
TString& rpad(const int n,const char c=' ');
// @cmember Aggiunge spazi a sinistra fino alla dimensione indicata
TString & zerofill(const int n) { return lpad(n, '0'); }
// @cmember Aggiunge spazi a sinistra fino alla dimensione indicata
TString& lpad(const int n,const char c=' ');

19
src/ps/flexform_xml.cpp
View File

@ -6,6 +6,7 @@
#include "date.h"
#include "progind.h"
#include "velib.h"
#include "sqlset.h"
#define CHECK_CONDXML_OR_RETURNFALSE(cond, msg) { \
TString str; \
@ -275,6 +276,16 @@ bool TFlexform_xml_ordini::convert() const
return false;
}
TString TFlexform_xml_ordini::flexart2codart(const TString& cod_art_flexform)
{
TSQL_recordset sql("");
TString query; query << "SELECT * FROM ANAMAG WHERE COD_PMS = '" << cod_art_flexform << "'";
sql.set(query);
if(sql.items() == 1)
return sql.get(sql.find_column("CODART")).as_string();
return "";
}
bool TFlexform_xml_ordini::create_doc()
{
const shared_ptr<TXML_element> esa_import = _importer._imported[1];
@ -319,14 +330,16 @@ bool TFlexform_xml_ordini::create_doc()
const TString& qta_merce = datarow_r.get_val_child("qta_merce");
const TString& dat_evas_riga = datarow_r.get_val_child("dat_evas_riga");
const TString& des_campo_libero6 = datarow_r.get_val_child("des_campo_libero6");
TString cod_art_major = flexart2codart(cod_art);
TRiga_documento& d_row = doc.new_row(ind_tiporiga == "D" ? "05" : "01");
if (ind_tiporiga != "D")
d_row.put(RDOC_CODART, cod_art); // todo: codice articolo da mandarlo a cercare nell'altro campo
d_row.put(RDOC_CODART, !cod_art_major.empty() ? cod_art_major : cod_art);
d_row.put(RDOC_DESCR, des_articolo_riga);
d_row.put(RDOC_QTA, qta_merce);
d_row.put(RDOC_QTA, qta_merce);
d_row.put("DATA_EVASIONE_RIGA", dat_evas_riga); // RG1 -> DATA_EVASIONE_RIGA
d_row.put("CODFLEX", des_campo_libero6); // RG1 -> CODFLEX
d_row.put("CODFLEX", des_campo_libero6); // RG1 -> CODFLEX
}
bool ok = doc.write() == NOERR;

2
src/ps/flexform_xml.h
View File

@ -209,6 +209,8 @@ public:
bool convert() const;
bool create_doc();
static TString flexart2codart(const TString& string);
TFlexform_xml_ordini(const char* xml_name = "", const char* codnum = "", int codcli_flex = 12);
};

2
src/ps/ps6362.cpp
View File

@ -9,7 +9,7 @@ int main(int argc, char** argv)
switch (r)
{
default:
case 0: rt = ps6362100(argc, argv); break; // Esportrazione Major-Flexform
case 0: rt = ps6362100(argc, argv); break; // Import/Export Major-Flexform
}
return rt;
}

32
src/ps/ps6362100.cpp
View File

@ -151,7 +151,7 @@ void TMajor_export_mask::load_all()
// Main Program
///////////////////////////////////////////////////////////
class TMajor_export_app : public TSkeleton_application
class TMajor_flexform_boll_app : public TSkeleton_application
{
TString _fld_dest;
@ -163,16 +163,16 @@ class TMajor_export_app : public TSkeleton_application
void main_loop() override;
public:
TMajor_export_app() = default;
TMajor_flexform_boll_app() = default;
};
bool TMajor_export_app::create()
bool TMajor_flexform_boll_app::create()
{
open_files(LF_DOC, LF_RIGHEDOC);
return TSkeleton_application::create();
}
TFilename TMajor_export_app::check_name_file(const TString& dir, const bool sub_fld, const int from, const int to, bool ddt)
TFilename TMajor_flexform_boll_app::check_name_file(const TString& dir, const bool sub_fld, const int from, const int to, bool ddt)
{
TString cartella = dir; cartella << "/";
if (sub_fld)
@ -206,7 +206,7 @@ TFilename TMajor_export_app::check_name_file(const TString& dir, const bool sub_
return xml;
}
TString TMajor_export_app::get_riferimento_flexform(const TSQL_recordset& righe_doc)
TString TMajor_flexform_boll_app::get_riferimento_flexform(const TSQL_recordset& righe_doc)
{
const TString& rg1 = righe_doc.get(3).as_string();
const TToken_string t(rg1, char(0xB6)); // Simbolo paragrafo ¶
@ -227,7 +227,7 @@ TString TMajor_export_app::get_riferimento_flexform(const TSQL_recordset& righe_
return "";
}
bool TMajor_export_app::export_ddt(TMask& msk)
bool TMajor_flexform_boll_app::export_ddt(TMask& msk)
{
const TString& dir = msk.get(F_FLDDEST);
const bool sub_fld = msk.get_bool(F_SUBFLD);
@ -257,21 +257,23 @@ bool TMajor_export_app::export_ddt(TMask& msk)
xml_ddts.set_testata(day.string(), n_doc);
// Righe documento
TString query_righe;
query_righe << "SELECT CODART, DESCR, QTA, RG1, DESCLUNGA, DESCEST\n"
"FROM rdoc\nWHERE CODNUM = '" << codnum << "' AND ANNO = " << year << " AND PROVV = 'D' AND NDOC=" << n_doc;
query_righe << "SELECT rdoc.CODART, rdoc.DESCR, rdoc.QTA, rdoc.RG1, rdoc.DESCLUNGA, rdoc.DESCEST, COD_PMS\n"
"FROM rdoc\n"
"JOIN anamag ON rdoc.CODART = anamag.CODART\n"
"WHERE CODNUM = '" << codnum << "' AND ANNO = " << year << " AND PROVV = 'D' AND NDOC=" << n_doc;
TSQL_recordset righe_doc(query_righe);
for (bool ok_r = righe_doc.move_first(); ok_r; ok_r = righe_doc.move_next())
{
shared_ptr<TDDT_riga_xml> riga = xml_ddts.new_row();
const TString& cod_art = righe_doc.get(0).as_string(); // todo: usa il cod.art. di flexform non quello di campo (vedi terza colonna nell'anteprima)
const TString& cod_art_flexform = righe_doc.get(6).as_string();
TString descr = righe_doc.get(1).as_string();
const TString& qta = righe_doc.get(2).as_string();
const TString& desccampolibero6 = get_riferimento_flexform(righe_doc); // get(3) RG1
if (righe_doc.get(4).as_bool())
descr << righe_doc.get(5).as_string();
riga->set_datarow("C", cod_art, descr, qta, desccampolibero6);
riga->set_datarow("C", cod_art_flexform, descr, qta, desccampolibero6);
xml_ddts.add_row(riga);
}
}
@ -281,14 +283,14 @@ bool TMajor_export_app::export_ddt(TMask& msk)
return ok;
}
bool TMajor_export_app::import_ordini(TMask& msk)
bool TMajor_flexform_boll_app::import_ordini(TMask& msk)
{
bool ok = false;
const TString& dir_in = msk.get(F_FLDSOURCE);
const TString& cod_cli = msk.get(F_CODCF);
const TString& tiponumord = msk.get(F_NUMORD);
TFilename path(dir_in);
TFilename path(dir_in);
TString_array flist;
path.add("*.xml");
list_files(path, flist);
@ -323,7 +325,7 @@ bool TMajor_export_app::import_ordini(TMask& msk)
return ok;
}
void TMajor_export_app::main_loop()
void TMajor_flexform_boll_app::main_loop()
{
TMajor_export_mask msk;
while (msk.run() == K_ENTER)
@ -351,7 +353,7 @@ void TMajor_export_app::main_loop()
int ps6362100(const int argc, char* argv[])
{
TMajor_export_app pe;
pe.run(argc, argv, TR("Esportazione Major-Flexform"));
TMajor_flexform_boll_app pe;
pe.run(argc, argv, TR("Import/Export Major-Flexform"));
return 0;
}

4
src/ve/sconti.h
View File

@ -1,10 +1,6 @@
#ifndef __SCONTI_H
#define __SCONTI_H
#ifndef __TCLIFOR_H
#include "clifor.h"
#endif
#ifndef __VELIB_H
#include "velib.h"
#endif

7
src/ve/velib.h
View File

@ -21,10 +21,6 @@
class TViswin;
#endif
#ifndef __CLIFOR_H
#include "../ve/clifor.h"
#endif
#ifndef __VERIG_H
#include "../ve/verig.h"
#endif
@ -972,7 +968,8 @@ public:
TString & registrazione, TString & data_registrazione) const;
bool is_split_payment() const;
void cli2doc() { clifor().cli2doc(*this); }
void cli2doc();
TDocumento ();
TDocumento (const TDocumento& d);
TDocumento(char provv, int anno, const char* codnum, long numdoc);

90
src/ve/velib03.cpp
View File

@ -5,7 +5,7 @@
#include <tabutil.h>
#include <utility.h>
#include "../cg/cglib.h"
#include "../cg/cfban.h"
#include "../db/dblib.h"
#include "../pr/prlib.h"
#include "../li/letint.h"
@ -3416,4 +3416,90 @@ bool TDocumento::is_split_payment() const
}
}
return yes;
}
}
void TDocumento::cli2doc()
{
const TRectype& v = clifor().vendite();
put(DOC_CODVAL, get(CLI_CODVAL));
put(DOC_CODLIN, get(CLI_CODLIN));
put(DOC_CODPAG, get(CLI_CODPAG));
TToken_string key;
key.add(get(CLI_TIPOCF));
key.add(get(CLI_CODCF));
key.add("V");
key.add("1");
const TRectype& cfban = cache().get(LF_CFBAN, key);
if (cfban.empty())
{
put(DOC_CODABIA, get(CLI_CODABI));
put(DOC_CODCABA, get(CLI_CODCAB));
put(DOC_IBAN, get(CLI_IBAN));
}
else
{
put(DOC_CODABIA, cfban.get(CFBAN_ABI));
put(DOC_CODCABA, cfban.get(CFBAN_CAB));
put(DOC_IBAN, cfban.get(CFBAN_IBAN));
}
// Trasforma chiave da Vostra a Nostra banca
key.add("N", 2);
const TRectype& cfbanpr = cache().get(LF_CFBAN, key);
// Setta i campi che appartengono al file LF_CFVEN
if (cfbanpr.empty())
{
put(DOC_CODABIP, v.get(CFV_CODABIPR));
put(DOC_CODCABP, v.get(CFV_CODCABPR));
}
else
{
put(DOC_CODABIP, cfbanpr.get(CFBAN_ABI));
put(DOC_CODCABP, cfbanpr.get(CFBAN_CAB));
put(DOC_PROGBNP, cfbanpr.get(CFBAN_PROGPR));
}
put(DOC_RAGGR, v.get(CFV_RAGGDOC));
put(DOC_RAGGREFF, v.get(CFV_RAGGEFF));
put(DOC_CODINDSP, v.get(CFV_CODINDSP));
put(DOC_CODAG, v.get(CFV_CODAG));
put(DOC_CODAGVIS, v.get(CFV_CODAG1));
put(DOC_CODSPMEZZO, v.get(CFV_CODSPMEZZO));
put(DOC_CODPORTO, v.get(CFV_CODPORTO));
put(DOC_CODNOTESP1, v.get(CFV_CODNOTESP1));
put(DOC_CODNOTESP2, v.get(CFV_CODNOTESP2));
put(DOC_CODNOTE, v.get(CFV_CODNOTE));
put(DOC_CODVETT1, v.get(CFV_CODVETT1));
put(DOC_CODVETT2, v.get(CFV_CODVETT2));
put(DOC_CODVETT3, v.get(CFV_CODVETT3));
put(DOC_PERCSPINC, v.get(CFV_PERCSPINC));
put(DOC_ADDBOLLI, v.get(CFV_ADDBOLLI));
put(DOC_CATVEN, v.get(CFV_CATVEN));
const int alleg = get_int(CLI_ALLEG);
const bool split_payment = get_date(DOC_DATADOC).year() >= 2015 && get_bool(CLI_SPLITPAY);
put(DOC_LIQDIFF, !split_payment && alleg == 7 && ini_get_bool(CONFIG_DITTA, "cg", "GesLiqDiff") ? "X" : "");
//listino: deve essere attiva la gestione listini nella ditta
const bool gest_listini = ini_get_bool(CONFIG_DITTA, "ve", "GES", false, 1);
if (gest_listini)
{
const TDate datadoc = get_date(DOC_DATADOC);
const TString& listino = clifor().find_listino_al(datadoc);
put(DOC_CODLIST, listino);
}
put(DOC_ZONA, v.get(CFV_CODZONA));
put(DOC_RAGGR, v.get(CFV_RAGGDOC));
//aggiungere gestione spese e bolli???
put(DOC_CODPORTO, v.get(CFV_CODPORTO));
}