[Libreoffice-commits] .: connectivity/source postgresql/prj

[Jesús Corrius]

 connectivity/source/drivers/postgresql/makefile.mk |    4 ----
 postgresql/prj/d.lst                               |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit da7058c856f6b69d6c7d1134fdf0a764fd0202c9
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Fri May 4 08:47:35 2012 +0200

    Revert "Fix Windows debug build."
    
    This reverts commit db649c52911fd5b030a7e4e0c941d7ee75b98785.
    
    I will patch the external postgresql library instead.

diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index 26e878b..acf8b8c 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 9c7201c..8f6d9ab 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
+