connectivity/source/drivers/postgresql/makefile.mk | 4 ++++
postgresql/prj/d.lst | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit db649c52911fd5b030a7e4e0c941d7ee75b98785
Author: Jesús Corrius <je...@softcatala.org>
Date: Thu May 3 13:34:01 2012 +0200
Fix Windows debug build.
The postgresql static library on Windows is named libpqd.lib in
debug and libpq.lib when compiled in release. We prefer to not
touch the external postgresql, so we make the proper changes in
the connectivity module.
diff --git a/connectivity/source/drivers/postgresql/makefile.mk
b/connectivity/source/drivers/postgresql/makefile.mk
index acf8b8c..26e878b 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -81,7 +81,11 @@ LIBPQ_DEP_LIBS=
LIBPQ_LINK=-lpq
.ELSE #SYSTEM_POSTGRESQL==NO
.IF "$(GUI)$(COM)"=="WNTMSC"
+.IF "$(debug)" == ""
LIBPQ_LINK:=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib
shell32.lib
+.ELSE
+LIBPQ_LINK:=$(OUTDIR)/lib/libpqd.lib ws2_32.lib secur32.lib advapi32.lib
shell32.lib
+.ENDIF
LIBPQ_DEP_LIBS += \
$(OPENSSLLIB)
.IF "$(WITH_LDAP)" == "YES"
diff --git a/postgresql/prj/d.lst b/postgresql/prj/d.lst
index 8f6d9ab..9c7201c 100644
--- a/postgresql/prj/d.lst
+++ b/postgresql/prj/d.lst
@@ -5,4 +5,4 @@ mkdir: %_DEST%\inc\postgresql
..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq-flags.mk
%_DEST%\inc\postgresql
..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq.a %_DEST%\lib
..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq.lib %_DEST%\lib
-
+..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpqd.lib %_DEST%\lib
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
