From 547d1dd2da9c9b2b010da6d167ac88959342a634 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 30 Aug 2010 15:49:05 +0200
Subject: Support for automake and VC++ builds

---
 odb/compilers/vc/pre.hxx |  7 ++++++-
 odb/libodb-vc10.vcxproj  | 16 ++++++++--------
 odb/libodb-vc9.vcproj    |  8 ++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'odb')

diff --git a/odb/compilers/vc/pre.hxx b/odb/compilers/vc/pre.hxx
index cdcb527..13a006b 100644
--- a/odb/compilers/vc/pre.hxx
+++ b/odb/compilers/vc/pre.hxx
@@ -19,10 +19,15 @@
 #pragma warning (disable:4355) // passing 'this' to a member
 #pragma warning (disable:4800) // forcing value to bool
 #pragma warning (disable:4290) // exception specification ignored
+
 //#pragma warning (disable:4275) // non dll-interface base
-//#pragma warning (disable:4251) // base needs to have dll-interface
 //#pragma warning (disable:4224) // nonstandard extension  (/Za option)
 
+// VC++ 10.0 (2010)
+//
+#if (_MSC_VER == 1600)
+#  pragma warning (disable:4251) // needs to have DLL-interface
+#endif
 
 // Elevated warnings.
 //
diff --git a/odb/libodb-vc10.vcxproj b/odb/libodb-vc10.vcxproj
index 5047a56..81f1a2a 100644
--- a/odb/libodb-vc10.vcxproj
+++ b/odb/libodb-vc10.vcxproj
@@ -65,12 +65,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\bin\</OutDir>
-    <TargetName>odb_d-__value__(interface_version)-vc10</TargetName>
+    <TargetName>odb-d-__value__(interface_version)-vc10</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\bin64\</OutDir>
-    <TargetName>odb_d-__value__(interface_version)-vc10</TargetName>
+    <TargetName>odb-d-__value__(interface_version)-vc10</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -90,13 +90,13 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib\odb_d.lib</ImportLibrary>
+      <ImportLibrary>..\lib\odb-d.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -107,13 +107,13 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\lib64\odb_d.lib</ImportLibrary>
+      <ImportLibrary>..\lib64\odb-d.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -126,7 +126,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -147,7 +147,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/odb/libodb-vc9.vcproj b/odb/libodb-vc9.vcproj
index ac970db..3877c89 100644
--- a/odb/libodb-vc9.vcproj
+++ b/odb/libodb-vc9.vcproj
@@ -66,11 +66,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin\odb_d-__value__(interface_version)-vc9.dll"
+				OutputFile="$(OutDir)\bin\odb-d-__value__(interface_version)-vc9.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib\odb_d.lib"
+				ImportLibrary="$(OutDir)\lib\odb-d.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -143,11 +143,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\bin64\odb_d-__value__(interface_version)-vc9.dll"
+				OutputFile="$(OutDir)\bin64\odb-d-__value__(interface_version)-vc9.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib64\odb_d.lib"
+				ImportLibrary="$(OutDir)\lib64\odb-d.lib"
 				TargetMachine="17"
 			/>
 			<Tool
-- 
cgit v1.1