Author: ajborley
Date: Fri Oct 6 08:20:41 2006
New Revision: 453637
URL: http://svn.apache.org/viewvc?view=rev&rev=453637
Log:
Applied Geoff's TUSCANY-802 patch to allow the SDO samples to be build with
STDCXX
Modified:
incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/misc.sln
incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
Modified:
incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/misc.sln
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/misc.sln?view=diff&rev=453637&r1=453636&r2=453637
==============================================================================
--- incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/misc.sln
(original)
+++ incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/misc.sln
Fri Oct 6 08:20:41 2006
@@ -1,10 +1,14 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdo_misc",
"sdo_misc\sdo_misc.vcproj", "{0B4E79E7-D66A-4501-9941-580C3E00A382}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
+ Debug = Debug
+ Release = Release
+ stdcxx-Debug = stdcxx-Debug
+ stdcxx-Release = stdcxx-Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
@@ -13,6 +17,10 @@
{0B4E79E7-D66A-4501-9941-580C3E00A382}.Debug.Build.0 =
Debug|Win32
{0B4E79E7-D66A-4501-9941-580C3E00A382}.Release.ActiveCfg =
Release|Win32
{0B4E79E7-D66A-4501-9941-580C3E00A382}.Release.Build.0 =
Release|Win32
+ {0B4E79E7-D66A-4501-9941-580C3E00A382}.stdcxx-Debug.ActiveCfg =
stdcxx-Debug|Win32
+ {0B4E79E7-D66A-4501-9941-580C3E00A382}.stdcxx-Debug.Build.0 =
stdcxx-Debug|Win32
+ {0B4E79E7-D66A-4501-9941-580C3E00A382}.stdcxx-Release.ActiveCfg
= stdcxx-Release|Win32
+ {0B4E79E7-D66A-4501-9941-580C3E00A382}.stdcxx-Release.Build.0 =
stdcxx-Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified:
incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj?view=diff&rev=453637&r1=453636&r2=453637
==============================================================================
---
incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
(original)
+++
incubator/tuscany/cpp/sdo/samples/ides/devstudio7/projects/misc/sdo_misc/sdo_misc.vcproj
Fri Oct 6 08:20:41 2006
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.00"
+ Version="7.10"
Name="sdo_misc"
+ RootNamespace="sdo_misc"
SccProjectName=""
SccLocalPath="">
<Platforms>
@@ -64,7 +65,14 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"
+ Output=""/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -124,9 +132,148 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
+ Name="VCXMLDataGeneratorTool"
+ Output=""/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="stdcxx-Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
AdditionalIncludeDirectories=""$(TUSCANY_SDOCPP)\include";"$(STDCXX_HOME)\include";"$(STDCXX_HOME)\include\ansi";"$(STDCXX_HOME)\Debug\include\15d""
+
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_RWSTD_USE_CONFIG;_RWSHARED;_RWSTDDEBUG"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=""
+
AssemblerListingLocation=".\$(ConfigurationName)/"
+ ObjectFile=".\$(ConfigurationName)/"
+
ProgramDataBaseFileName=".\$(ConfigurationName)/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="odbc32.lib odbccp32.lib
tuscany_sdo.lib stdlib15d.lib"
+ OutputFile=".\$(ConfigurationName)/sdo_misc.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+
AdditionalLibraryDirectories=""$(TUSCANY_SDOCPP)\lib";"$(STDCXX_HOME)\Debug\lib""
+ GenerateDebugInformation="TRUE"
+
ProgramDatabaseFile=".\$(ConfigurationName)/sdo_misc.pdb"
+ SubSystem="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/sdo_misc.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="if not exist
..\..\..\..\..\misc\deploy mkdir ..\..\..\..\..\misc\deploy
+if not exist ..\..\..\..\..\misc\deploy\bin mkdir
..\..\..\..\..\misc\deploy\bin
+copy ..\..\..\..\..\misc\*.xsd ..\..\..\..\..\misc\deploy
+copy ..\..\..\..\..\misc\*.xml ..\..\..\..\..\misc\deploy
+copy $(ConfigurationName)\*.exe ..\..\..\..\..\misc\deploy\bin
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="2057"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ Output=""/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="stdcxx-Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""$(TUSCANY_SDOCPP)\include";"$(STDCXX_HOME)\include";"$(STDCXX_HOME)\include\ansi";"$(STDCXX_HOME)\Release\include\12d""
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_RWSTD_USE_CONFIG;_RWSHARED"
+ RuntimeLibrary="2"
+ PrecompiledHeaderFile=""
+
AssemblerListingLocation=".\$(ConfigurationName)/"
+ ObjectFile=".\$(ConfigurationName)/"
+
ProgramDataBaseFileName=".\$(ConfigurationName)/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/MACHINE:I386"
+ AdditionalDependencies="odbc32.lib odbccp32.lib
tuscany_sdo.lib stdlib12d.lib"
+ OutputFile=".\$(ConfigurationName)/sdo_misc.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+
AdditionalLibraryDirectories=""$(TUSCANY_SDOCPP)\lib";"$(STDCXX_HOME)\Release\lib""
+
ProgramDatabaseFile=".\$(ConfigurationName)/sdo_misc.pdb"
+ SubSystem="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/sdo_misc.tlb"/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="if not exist
..\..\..\..\..\misc\deploy mkdir ..\..\..\..\..\misc\deploy
+if not exist ..\..\..\..\..\misc\deploy\bin mkdir
..\..\..\..\..\misc\deploy\bin
+copy ..\..\..\..\..\misc\*.xsd ..\..\..\..\..\misc\deploy
+copy ..\..\..\..\..\misc\*.xml ..\..\..\..\..\misc\deploy
+copy $(ConfigurationName)\*.exe ..\..\..\..\..\misc\deploy\bin
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="2057"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ Output=""/>
+ <Tool
Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<Filter
Name="Source Files"
@@ -141,13 +288,13 @@
RelativePath="..\..\..\..\..\misc\Query.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\misc\Substitutes.cpp">
+ RelativePath="..\..\..\..\..\misc\samples.cpp">
</File>
<File
-
RelativePath="..\..\..\..\..\misc\XSDLoading.cpp">
+
RelativePath="..\..\..\..\..\misc\Substitutes.cpp">
</File>
<File
- RelativePath="..\..\..\..\..\misc\samples.cpp">
+
RelativePath="..\..\..\..\..\misc\XSDLoading.cpp">
</File>
</Filter>
<Filter
@@ -164,13 +311,13 @@
RelativePath="..\..\..\..\..\misc\ChangeSummarySave.xsd">
</File>
<File
-
RelativePath="..\..\..\..\..\misc\XSDLoading.xml">
+
RelativePath="..\..\..\..\..\misc\companysubs.xsd">
</File>
<File
-
RelativePath="..\..\..\..\..\misc\XSDLoading.xsd">
+
RelativePath="..\..\..\..\..\misc\XSDLoading.xml">
</File>
<File
-
RelativePath="..\..\..\..\..\misc\companysubs.xsd">
+
RelativePath="..\..\..\..\..\misc\XSDLoading.xsd">
</File>
</Filter>
<File
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
