summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesús Corrius <jesus@softcatala.org>2012-05-04 08:47:35 +0200
committerJesús Corrius <jesus@softcatala.org>2012-05-04 08:47:35 +0200
commitda7058c856f6b69d6c7d1134fdf0a764fd0202c9 (patch)
tree4fcb2e9c62eeca16a57c7030a45a32e9456ecfe8
parentacbbd79b031889cc138a093813f3b8c2ceb9a3f5 (diff)
Revert "Fix Windows debug build."
This reverts commit db649c52911fd5b030a7e4e0c941d7ee75b98785. I will patch the external postgresql library instead.
-rw-r--r--connectivity/source/drivers/postgresql/makefile.mk4
-rw-r--r--postgresql/prj/d.lst2
2 files changed, 1 insertions, 5 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index 26e878b8ee1a..acf8b8c87ac1 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -81,11 +81,7 @@ 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 9c7201cda7d0..8f6d9ab2e680 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
+