diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-09 14:50:17 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-09 14:50:44 +0100 |
| commit | a4845bd70e7e759e853ca0458ee27c65c165c91c (patch) | |
| tree | 3d858d1cc7a804177966e3b02bc740412ed11814 /connectivity | |
| parent | 91af205a93440b82ff1730528e98e6355092e02c (diff) | |
Make link and deliver the postgresql.oxt extension also on windows
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/prj/d.lst | 1 | ||||
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index 55099c2add78..954a89dc1d12 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -8,6 +8,7 @@ ..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.* ..\%__SRC%\lib\idbt* %_DEST%\lib\idbt* ..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt +..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt ..\source\cpool\*.xml %_DEST%\xml\*.xml ..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml ..\source\drivers\ado\*.xml %_DEST%\xml\*.xml diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index ac19cd9e93d6..91184d872db0 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -102,13 +102,13 @@ SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map # as per instructions in libpq documentation. # If it turns out the rest was needed, reenable it. .IF "$(SYSTEM_POSTGRESQL)"=="YES" -.IF "$(GUI)"=="WNT" -LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib -.ELSE -LIBPQ_LINK=-lpq #-lcrypt -.ENDIF +LIBPQ_LINK=-lpq .ELSE #SYSTEM_POSTGRESQL==NO +.IF "$(GUI)$(COM)"=="WNTMSC" +LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib +.ELSE LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a +.ENDIF POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql POSTGRESQL_LIB= .ENDIF |