Author: ajborley
Date: Fri Sep 22 13:35:20 2006
New Revision: 449078
URL: http://svn.apache.org/viewvc?view=rev&rev=449078
Log:
Applied Geoff's sln patch for TUSCANY-724. Enables the building of SDO with the
STDCXX STL libraries rather than the MS STL
Removed:
incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.suo
Modified:
incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
Modified:
incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj?view=diff&rev=449078&r1=449077&r2=449078
==============================================================================
---
incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
(original)
+++
incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/sdo_runtime/sdo_runtime.vcproj
Fri Sep 22 13:35:20 2006
@@ -22,17 +22,18 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\runtime\core\src,$(LIBXML2_HOME)\include,$(ICONV_HOME)\include,$(ZLIB_HOME)\include"
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDO_EXPORTS"
+
AdditionalIncludeDirectories="..\..\..\runtime\core\src;"$(LIBXML2_HOME)\include";"$(ICONV_HOME)\include";"$(ZLIB_HOME)\include""
+
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDO_EXPORTS;_RWSTD_USE_CONFIG;_RWSHARED;_RWSTDDEBUG"
+ IgnoreStandardIncludePath="FALSE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- PrecompiledHeaderFile=".\Debug/sdo_runtime.pch"
+ PrecompiledHeaderFile=""
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@@ -43,7 +44,7 @@
OutputFile=".\Debug\tuscany_sdo.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
-
AdditionalLibraryDirectories="$(LIBXML2_HOME)\lib"
+
AdditionalLibraryDirectories=""$(LIBXML2_HOME)\lib""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/tuscany_sdo.pdb"
ImportLibrary=".\Debug/tuscany_sdo.lib"/>
Modified: incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln?view=diff&rev=449078&r1=449077&r2=449078
==============================================================================
--- incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln (original)
+++ incubator/tuscany/cpp/sdo/projectsvc7/tuscany_sdo/tuscany_sdo.sln Fri Sep
22 13:35:20 2006
@@ -1,23 +1,29 @@
-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_axiom",
"sdo_axiom\sdo_axiom.vcproj", "{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE} =
{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdo_axiom_test",
"sdo_axiom_test\sdo_axiom_test.vcproj", "{CE1FE92A-3F1C-4AD2-922C-E16703402234}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C22D761C-F453-45EB-AA23-D13E2F3B786B} =
{C22D761C-F453-45EB-AA23-D13E2F3B786B}
+ {EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE} =
{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}
+ {BF03BF2B-8F39-4458-8AD9-E3420988EFCA} =
{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdo_runtime",
"sdo_runtime\sdo_runtime.vcproj", "{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdo_test",
"sdo_test\sdo_test.vcproj", "{C22D761C-F453-45EB-AA23-D13E2F3B786B}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE} =
{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- {BF03BF2B-8F39-4458-8AD9-E3420988EFCA}.0 =
{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}
- {CE1FE92A-3F1C-4AD2-922C-E16703402234}.0 =
{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}
- {CE1FE92A-3F1C-4AD2-922C-E16703402234}.1 =
{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}
- {CE1FE92A-3F1C-4AD2-922C-E16703402234}.2 =
{C22D761C-F453-45EB-AA23-D13E2F3B786B}
- {C22D761C-F453-45EB-AA23-D13E2F3B786B}.0 =
{EAA49F3B-30A9-4F59-BCD7-F5769A28C1CE}
+ Debug = Debug
+ Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{BF03BF2B-8F39-4458-8AD9-E3420988EFCA}.Debug.ActiveCfg =
Debug|Win32
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]