connectivity/prj/d.lst | 1 +
connectivity/source/drivers/postgresql/makefile.mk | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit a4845bd70e7e759e853ca0458ee27c65c165c91c
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Fri Dec 9 14:50:17 2011 +0100
Make link and deliver the postgresql.oxt extension also on windows
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 55099c2..954a89d 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 ac19cd9..91184d8 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
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
