projects
/
shibboleth
/
sp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.2.1+dfsg
[shibboleth/sp.git]
/
odbc-store
/
odbc-store.vcproj
diff --git
a/odbc-store/odbc-store.vcproj
b/odbc-store/odbc-store.vcproj
index
1b6a307
..
b15cf98
100644
(file)
--- a/
odbc-store/odbc-store.vcproj
+++ b/
odbc-store/odbc-store.vcproj
@@
-1,11
+1,12
@@
<?xml version="1.0" encoding="Windows-1252"?>
\r
<VisualStudioProject
\r
ProjectType="Visual C++"
\r
<?xml version="1.0" encoding="Windows-1252"?>
\r
<VisualStudioProject
\r
ProjectType="Visual C++"
\r
- Version="
8
.00"
\r
+ Version="
9
.00"
\r
Name="odbc-store"
\r
ProjectGUID="{666A63A7-983F-4C19-8411-207F24305197}"
\r
RootNamespace="odbcstore"
\r
Keyword="Win32Proj"
\r
Name="odbc-store"
\r
ProjectGUID="{666A63A7-983F-4C19-8411-207F24305197}"
\r
RootNamespace="odbcstore"
\r
Keyword="Win32Proj"
\r
+ TargetFrameworkVersion="131072"
\r
>
\r
<Platforms>
\r
<Platform
\r
>
\r
<Platforms>
\r
<Platform
\r
@@
-65,12
+66,14
@@
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
- AdditionalDependencies="log4shib1D.lib xerces-c_
2
D.lib xmltooling1D.lib"
\r
+ AdditionalDependencies="log4shib1D.lib xerces-c_
3
D.lib xmltooling1D.lib"
\r
OutputFile="$(OutDir)\$(ProjectName).so"
\r
LinkIncremental="2"
\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"
\r
GenerateDebugInformation="true"
\r
SubSystem="2"
\r
OutputFile="$(OutDir)\$(ProjectName).so"
\r
LinkIncremental="2"
\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"
\r
GenerateDebugInformation="true"
\r
SubSystem="2"
\r
+ RandomizedBaseAddress="1"
\r
+ DataExecutionPrevention="0"
\r
TargetMachine="1"
\r
/>
\r
<Tool
\r
TargetMachine="1"
\r
/>
\r
<Tool
\r
@@
-92,19
+95,15
@@
Name="VCAppVerifierTool"
\r
/>
\r
<Tool
\r
Name="VCAppVerifierTool"
\r
/>
\r
<Tool
\r
- Name="VCWebDeploymentTool"
\r
- />
\r
- <Tool
\r
Name="VCPostBuildEventTool"
\r
/>
\r
</Configuration>
\r
<Configuration
\r
Name="VCPostBuildEventTool"
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
Release|Win32
"
\r
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
\r
- IntermediateDirectory="$(ConfigurationName)"
\r
+ Name="
Debug|x64
"
\r
+ OutputDirectory="$(SolutionDir)$(
PlatformName)\$(
ConfigurationName)"
\r
+ IntermediateDirectory="$(
PlatformName)\$(
ConfigurationName)"
\r
ConfigurationType="2"
\r
CharacterSet="2"
\r
ConfigurationType="2"
\r
CharacterSet="2"
\r
- WholeProgramOptimization="1"
\r
>
\r
<Tool
\r
Name="VCPreBuildEventTool"
\r
>
\r
<Tool
\r
Name="VCPreBuildEventTool"
\r
@@
-120,12
+119,17
@@
/>
\r
<Tool
\r
Name="VCMIDLTool"
\r
/>
\r
<Tool
\r
Name="VCMIDLTool"
\r
+ TargetEnvironment="3"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
+ Optimization="0"
\r
AdditionalIncludeDirectories=""..\..\cpp-xmltooling""
\r
AdditionalIncludeDirectories=""..\..\cpp-xmltooling""
\r
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
\r
- RuntimeLibrary="2"
\r
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
\r
+ MinimalRebuild="true"
\r
+ BasicRuntimeChecks="3"
\r
+ RuntimeLibrary="3"
\r
+ BrowseInformation="1"
\r
WarningLevel="3"
\r
Detect64BitPortabilityProblems="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="3"
\r
Detect64BitPortabilityProblems="true"
\r
DebugInformationFormat="3"
\r
@@
-135,20
+139,22
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
+ PreprocessorDefinitions="_DEBUG"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
- AdditionalDependencies="log4shib1
.lib xerces-c_2.lib xmltooling1
.lib"
\r
+ AdditionalDependencies="log4shib1
D.lib xerces-c_3D.lib xmltooling1D
.lib"
\r
OutputFile="$(OutDir)\$(ProjectName).so"
\r
OutputFile="$(OutDir)\$(ProjectName).so"
\r
- LinkIncremental="1"
\r
- AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"
\r
+ LinkIncremental="2"
\r
+ AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
\r
+ GenerateDebugInformation="true"
\r
SubSystem="2"
\r
SubSystem="2"
\r
-
OptimizeReferences="2
"
\r
-
EnableCOMDATFolding="2
"
\r
- TargetMachine="1"
\r
+
RandomizedBaseAddress="1
"
\r
+
DataExecutionPrevention="0
"
\r
+ TargetMachine="1
7
"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
@@
-169,18
+175,16
@@
Name="VCAppVerifierTool"
\r
/>
\r
<Tool
\r
Name="VCAppVerifierTool"
\r
/>
\r
<Tool
\r
- Name="VCWebDeploymentTool"
\r
- />
\r
- <Tool
\r
Name="VCPostBuildEventTool"
\r
/>
\r
</Configuration>
\r
<Configuration
\r
Name="VCPostBuildEventTool"
\r
/>
\r
</Configuration>
\r
<Configuration
\r
- Name="
Debug|x64
"
\r
- OutputDirectory="$(SolutionDir)$(
PlatformName)\$(
ConfigurationName)"
\r
- IntermediateDirectory="$(
PlatformName)\$(
ConfigurationName)"
\r
+ Name="
Release|Win32
"
\r
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
\r
+ IntermediateDirectory="$(ConfigurationName)"
\r
ConfigurationType="2"
\r
CharacterSet="2"
\r
ConfigurationType="2"
\r
CharacterSet="2"
\r
+ WholeProgramOptimization="1"
\r
>
\r
<Tool
\r
Name="VCPreBuildEventTool"
\r
>
\r
<Tool
\r
Name="VCPreBuildEventTool"
\r
@@
-196,17
+200,12
@@
/>
\r
<Tool
\r
Name="VCMIDLTool"
\r
/>
\r
<Tool
\r
Name="VCMIDLTool"
\r
- TargetEnvironment="3"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCCLCompilerTool"
\r
- Optimization="0"
\r
AdditionalIncludeDirectories=""..\..\cpp-xmltooling""
\r
AdditionalIncludeDirectories=""..\..\cpp-xmltooling""
\r
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
\r
- MinimalRebuild="true"
\r
- BasicRuntimeChecks="3"
\r
- RuntimeLibrary="3"
\r
- BrowseInformation="1"
\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
\r
+ RuntimeLibrary="2"
\r
WarningLevel="3"
\r
Detect64BitPortabilityProblems="true"
\r
DebugInformationFormat="3"
\r
WarningLevel="3"
\r
Detect64BitPortabilityProblems="true"
\r
DebugInformationFormat="3"
\r
@@
-216,20
+215,22
@@
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
/>
\r
<Tool
\r
Name="VCResourceCompilerTool"
\r
- PreprocessorDefinitions="_DEBUG"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
/>
\r
<Tool
\r
Name="VCPreLinkEventTool"
\r
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
- AdditionalDependencies="log4shib1
D.lib xerces-c_2D.lib xmltooling1D
.lib"
\r
+ AdditionalDependencies="log4shib1
.lib xerces-c_3.lib xmltooling1
.lib"
\r
OutputFile="$(OutDir)\$(ProjectName).so"
\r
OutputFile="$(OutDir)\$(ProjectName).so"
\r
- LinkIncremental="2"
\r
- AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
\r
- GenerateDebugInformation="true"
\r
+ LinkIncremental="1"
\r
+ AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"
\r
SubSystem="2"
\r
SubSystem="2"
\r
- TargetMachine="17"
\r
+ OptimizeReferences="2"
\r
+ EnableCOMDATFolding="2"
\r
+ RandomizedBaseAddress="1"
\r
+ DataExecutionPrevention="0"
\r
+ TargetMachine="1"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
/>
\r
<Tool
\r
Name="VCALinkTool"
\r
@@
-250,9
+251,6
@@
Name="VCAppVerifierTool"
\r
/>
\r
<Tool
\r
Name="VCAppVerifierTool"
\r
/>
\r
<Tool
\r
- Name="VCWebDeploymentTool"
\r
- />
\r
- <Tool
\r
Name="VCPostBuildEventTool"
\r
/>
\r
</Configuration>
\r
Name="VCPostBuildEventTool"
\r
/>
\r
</Configuration>
\r
@@
-300,7
+298,7
@@
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
/>
\r
<Tool
\r
Name="VCLinkerTool"
\r
- AdditionalDependencies="log4shib1.lib xerces-c_
2
.lib xmltooling1.lib"
\r
+ AdditionalDependencies="log4shib1.lib xerces-c_
3
.lib xmltooling1.lib"
\r
OutputFile="$(OutDir)\$(ProjectName).so"
\r
LinkIncremental="1"
\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
\r
OutputFile="$(OutDir)\$(ProjectName).so"
\r
LinkIncremental="1"
\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"
\r
@@
-308,6
+306,8
@@
SubSystem="2"
\r
OptimizeReferences="2"
\r
EnableCOMDATFolding="2"
\r
SubSystem="2"
\r
OptimizeReferences="2"
\r
EnableCOMDATFolding="2"
\r
+ RandomizedBaseAddress="1"
\r
+ DataExecutionPrevention="0"
\r
TargetMachine="17"
\r
/>
\r
<Tool
\r
TargetMachine="17"
\r
/>
\r
<Tool
\r
@@
-329,9
+329,6
@@
Name="VCAppVerifierTool"
\r
/>
\r
<Tool
\r
Name="VCAppVerifierTool"
\r
/>
\r
<Tool
\r
- Name="VCWebDeploymentTool"
\r
- />
\r
- <Tool
\r
Name="VCPostBuildEventTool"
\r
/>
\r
</Configuration>
\r
Name="VCPostBuildEventTool"
\r
/>
\r
</Configuration>
\r