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.17:7990/scm/campo/campo into R_10_00

Browse Source 
# Conflicts:
#	build/fp0.vcxproj

Sistemati conflitti
This commit is contained in:
Sirio Builder 2018-07-31 16:11:40 +02:00
commit 3f4dcab79c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/fp0.vcxproj
View File

@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}</ProjectGuid> <ProjectGuid>{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}</ProjectGuid>
<RootNamespace>tf0</RootNamespace> <RootNamespace>fp</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -197,7 +197,6 @@
<ClCompile Include="..\src\fp\fp0.cpp" /> <ClCompile Include="..\src\fp\fp0.cpp" />
<ClCompile Include="..\src\fp\fp0100.cpp" /> <ClCompile Include="..\src\fp\fp0100.cpp" />
<ClCompile Include="..\src\fp\fp0300.cpp" /> <ClCompile Include="..\src\fp\fp0300.cpp" />
<ClCompile Include="..\src\fp\fplib01.cpp" />
<ClCompile Include="..\src\tf\tfutility.cpp" /> <ClCompile Include="..\src\tf\tfutility.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -212,7 +211,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\fp\fp0300a.h" /> <ClInclude Include="..\src\fp\fp0300a.h" />
<ClInclude Include="..\src\fp\fplib01.h" />
<ClInclude Include="..\src\tf\tfutility.h" /> <ClInclude Include="..\src\tf\tfutility.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -231,6 +229,12 @@
<FileType>Document</FileType> <FileType>Document</FileType>
</SqlCompiler> </SqlCompiler>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="..\src\fp\sql\fp0102.sql" />
</ItemGroup>
<ItemGroup>
<Library Include="..\lib\fplib.lib" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="CampoRules.targets" /> <Import Project="CampoRules.targets" />