aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-07-23 21:23:43 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-07-23 21:23:43 +0200
commitdc64a7a55f0018053f1360d5240d34b6fec003f6 (patch)
tree90fae09607ccbce2900b9cd5447519419976ef10
parentb70088d31a8d3e78409f4247c1f2db9092e828e3 (diff)
Correct libpq library name specified to Visual Studio linker
-rw-r--r--odb/pgsql/libodb-pgsql-vc10.vcxproj16
-rw-r--r--odb/pgsql/libodb-pgsql-vc9.vcproj16
2 files changed, 16 insertions, 16 deletions
diff --git a/odb/pgsql/libodb-pgsql-vc10.vcxproj b/odb/pgsql/libodb-pgsql-vc10.vcxproj
index 62af05e..c764ed2 100644
--- a/odb/pgsql/libodb-pgsql-vc10.vcxproj
+++ b/odb/pgsql/libodb-pgsql-vc10.vcxproj
@@ -88,12 +88,12 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>odb-d.lib;libpqdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>odb-d.lib;libpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OutputFile>$(TargetPath)</OutputFile>
@@ -106,12 +106,12 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>odb-d.lib;libpqdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>odb-d.lib;libpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OutputFile>$(TargetPath)</OutputFile>
@@ -126,12 +126,12 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>odb.lib;libpqdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>odb.lib;libpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -148,12 +148,12 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>odb.lib;libpqdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>odb.lib;libpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/odb/pgsql/libodb-pgsql-vc9.vcproj b/odb/pgsql/libodb-pgsql-vc9.vcproj
index 8f48b4f..af0b2c2 100644
--- a/odb/pgsql/libodb-pgsql-vc9.vcproj
+++ b/odb/pgsql/libodb-pgsql-vc9.vcproj
@@ -46,7 +46,7 @@
AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
Optimization="0"
AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odb-d.lib libpqdll.lib"
+ AdditionalDependencies="odb-d.lib libpq.lib"
OutputFile="$(OutDir)\bin\odb-pgsql-d-__value__(interface_version)-vc9.dll"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -124,7 +124,7 @@
AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
Optimization="0"
AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odb-d.lib libpqdll.lib"
+ AdditionalDependencies="odb-d.lib libpq.lib"
OutputFile="$(OutDir)\bin64\odb-pgsql-d-__value__(interface_version)-vc9.dll"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -203,7 +203,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -222,7 +222,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odb.lib libpqdll.lib"
+ AdditionalDependencies="odb.lib libpq.lib"
OutputFile="$(OutDir)\bin\odb-pgsql-__value__(interface_version)-vc9.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
@@ -284,7 +284,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\.."
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_PGSQL_DYNAMIC_LIB"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -303,7 +303,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odb.lib libpqdll.lib"
+ AdditionalDependencies="odb.lib libpq.lib"
OutputFile="$(OutDir)\bin64\odb-pgsql-__value__(interface_version)-vc9.dll"
LinkIncremental="1"
GenerateDebugInformation="true"