~ubuntu-branches/ubuntu/trusty/psqlodbc/trusty-proposed

« back to all changes in this revision

Viewing changes to psqlodbc.vcproj

  • Committer: Bazaar Package Importer
  • Author(s): Christoph Berg
  • Date: 2011-04-05 14:48:23 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20110405144823-n77supsa1hjj0ik6
Tags: 1:09.00.0200-1
* New upstream release.
* Fix installing {A,W}/usr/lib/odbc.  Closes: #618210.
* Convert to 3.0 (quilt).
* Remove psqlodbc-580878.diff: implemented upstream.
* Remove psqlodbc-585476.diff: was caused by #519006 which is now closed.
* Update description, suggested by Martin Eberhard Schauer.
  Closes: #565611.
* New maintainer.  Closes: #472818.

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
                                AdditionalOptions="/D SSL_DLL="\"SSLEAY32.dll\"""
45
45
                                Optimization="2"
46
46
                                InlineFunctionExpansion="1"
47
 
                                AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\8.2\include";"C:\OpenSSL\include""
 
47
                                AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\8.4\include";"C:\OpenSSL\include""
48
48
                                PreprocessorDefinitions="NDEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;DYNAMIC_LOAD;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE;USE_SSPI"
49
49
                                StringPooling="true"
50
50
                                RuntimeLibrary="0"
70
70
                        />
71
71
                        <Tool
72
72
                                Name="VCLinkerTool"
73
 
                                AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib XOleHlp.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib"
 
73
                                AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib XOleHlp.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib ws2_32.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib"
74
74
                                OutputFile="psqlodbc35w.dll"
75
75
                                LinkIncremental="1"
76
76
                                SuppressStartupBanner="true"
77
 
                                AdditionalLibraryDirectories="&quot;C:\Program Files\PostgreSQL\8.2\lib\ms&quot;;&quot;C:\OpenSSL\lib\VC&quot;"
 
77
                                AdditionalLibraryDirectories="&quot;C:\Program Files\PostgreSQL\8.4\lib\ms&quot;;&quot;C:\OpenSSL\lib\VC&quot;"
78
78
                                IgnoreAllDefaultLibraries="false"
79
79
                                ModuleDefinitionFile=".\psqlodbc.def"
80
80
                                DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll;XOLEHLP.DLL"
141
141
                                AdditionalOptions="/D SSL_DLL=&quot;\&quot;SSLEAY32.dll\&quot;&quot;"
142
142
                                Optimization="2"
143
143
                                InlineFunctionExpansion="1"
144
 
                                AdditionalIncludeDirectories="&quot;C:\Program Files\PostgreSQL\8.2\include&quot;;&quot;C:\OpenSSL\include&quot;"
 
144
                                AdditionalIncludeDirectories="&quot;C:\Program Files\PostgreSQL\8.4\include&quot;;&quot;C:\OpenSSL\include&quot;"
145
145
                                PreprocessorDefinitions="_DEBUG;USE_LIBPQ;WIN32;_WINDOWS;_USRDLL;PSQLODBC_EXPORTS;ODBCVER=0x0351;DRIVER_CURSOR_IMPLEMENT;WIN_MULTITHREAD_SUPPORT;DYNAMIC_LOAD;MULTIBYTE;UNICODE_SUPPORT;USE_SSL;_CRT_SECURE_NO_DEPRECATE;USE_SSPI"
146
146
                                StringPooling="true"
147
147
                                RuntimeLibrary="1"
168
168
                        />
169
169
                        <Tool
170
170
                                Name="VCLinkerTool"
171
 
                                AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib XOleHlp.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib"
 
171
                                AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib XOleHlp.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib ws2_32.lib winmm.lib libpq.lib ssleay32.lib libeay32.lib"
172
172
                                OutputFile="psqlodbc35w.dll"
173
173
                                LinkIncremental="2"
174
174
                                SuppressStartupBanner="true"
175
 
                                AdditionalLibraryDirectories="&quot;C:\Program Files\PostgreSQL\8.2\lib\ms&quot;;&quot;C:\OpenSSL\lib\VC&quot;"
 
175
                                AdditionalLibraryDirectories="&quot;C:\Program Files\PostgreSQL\8.4\lib\ms&quot;;&quot;C:\OpenSSL\lib\VC&quot;"
176
176
                                IgnoreAllDefaultLibraries="false"
177
177
                                ModuleDefinitionFile=".\psqlodbc.def"
178
178
                                DelayLoadDLLs="libpq.dll;ssleay32.dll;libeay32.dll;secur32.dll;crypt32.dll;XOLEHLP.DLL"