From 99049dded057279c60349026685bcbc52688c7bd Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 27 Nov 2017 14:16:22 +0000
Subject: [PATCH] Patch level         : 12.0 no-patch Files correlati     :
 Commento            : Sistemati progetti, adesso compilano correttamente

git-svn-id: svn://10.65.10.50/branches/R_10_00@24201 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 build/AgaLib.vcxproj         |  8 ++++++++
 build/xvturl.vcxproj         | 26 +++++++++++++++++++-------
 build/xvturl.vcxproj.filters |  4 ++--
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/build/AgaLib.vcxproj b/build/AgaLib.vcxproj
index 78ec7a096..f46c63cca 100644
--- a/build/AgaLib.vcxproj
+++ b/build/AgaLib.vcxproj
@@ -860,6 +860,14 @@
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
       <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
     </ProjectReference>
+    <ProjectReference Include="xvtdb.vcxproj">
+      <Project>{9c91bacf-9a70-4973-b8cc-fa3d2af9867c}</Project>
+      <Private>true</Private>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
     <ProjectReference Include="xvturl.vcxproj">
       <Project>{50f46f99-bd70-4bb3-ba95-7ae2baf35234}</Project>
       <Private>true</Private>
diff --git a/build/xvturl.vcxproj b/build/xvturl.vcxproj
index af49c67c4..af4a58c97 100644
--- a/build/xvturl.vcxproj
+++ b/build/xvturl.vcxproj
@@ -63,9 +63,9 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libraries\curl\builds\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\libraries\curl\builds\include\</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>
       </DebugInformationFormat>
@@ -77,7 +77,8 @@
       <Culture>0x0410</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>psapi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <DataExecutionPrevention>
@@ -86,6 +87,8 @@
       <TargetMachine>MachineX86</TargetMachine>
       <Version>12.0</Version>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -104,23 +107,25 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\libraries\curl\builds\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\libraries\curl\builds\include\</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0410</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
@@ -129,11 +134,18 @@
       <TargetMachine>MachineX86</TargetMachine>
       <Version>12.0</Version>
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>$(IntDir)$(TargetName).bsc</OutputFile>
     </Bscmake>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
     <CustomBuildStep Include="..\wx28X\lib\vc_dll\wxbase28.lib">
diff --git a/build/xvturl.vcxproj.filters b/build/xvturl.vcxproj.filters
index 1617fbf94..e613d31c4 100644
--- a/build/xvturl.vcxproj.filters
+++ b/build/xvturl.vcxproj.filters
@@ -22,10 +22,10 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <Library Include="..\libraries\curl\builds\lib\libcurl_a_debug.lib">
+    <Library Include="..\libraries\curl\builds\lib\libcurl_a.lib">
       <Filter>Libraries</Filter>
     </Library>
-    <Library Include="..\libraries\curl\builds\lib\libcurl_a.lib">
+    <Library Include="..\libraries\curl\builds\lib\libcurl_a_debug.lib">
       <Filter>Libraries</Filter>
     </Library>
   </ItemGroup>