[Libreoffice-commits] .: crashrep/source embedserv/util extensions/source

[Tor Lillqvist]

 crashrep/source/win32/makefile.mk |    2 +-
 embedserv/util/makefile.mk        |    2 --
 extensions/source/ole/makefile.mk |    4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 8ee6233f59d4e4cb0b4c21699be6cbff630a8ea6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 16 15:55:04 2011 +0300

    Use current terminology and socket library
    
    It's called the Windows SDK, not the Platform SDK. Link only with the
    ws2_32 library, not the wsock32 one.

diff --git a/crashrep/source/win32/makefile.mk b/crashrep/source/win32/makefile.mk
old mode 100755
new mode 100644
index 2f8aef7..21c0ab3
--- a/crashrep/source/win32/makefile.mk
+++ b/crashrep/source/win32/makefile.mk
@@ -67,7 +67,7 @@ STDLIB1=\
     $(COMCTL32LIB)\
     $(COMDLG32LIB)\
     $(ADVAPI32LIB)\
-    $(WSOCK32LIB)\
+    $(WS2_32LIB)\
     $(SHELL32LIB)\
     $(DBGHELPLIB)\
     psapi.lib
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
old mode 100755
new mode 100644
index 5af210d..1f8ad8a
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -74,11 +74,9 @@ SHL1STDLIBS+=\
         $(ATL_LIB)$/atls.lib
 .ENDIF
 
-.IF "$(WINDOWS_VISTA_PSDK)"!=""
 SHL1STDLIBS+=\
         $(ADVAPI32LIB)	\
         $(ATL_LIB)$/atls.lib
-.ENDIF # "$(WINDOWS_VISTA_PSDK)"!=""
 .ENDIF # "$(COM)"=="MSC"
 
 
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
index 58a2cc7..a9ff681 100644
--- a/extensions/source/ole/makefile.mk
+++ b/extensions/source/ole/makefile.mk
@@ -79,13 +79,11 @@ SHL1STDLIBS=\
     $(OLEAUT32LIB)
 
 .IF "$(COM)"=="MSC"
-.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
 .IF "$(USE_DEBUG_RUNTIME)" != ""
     SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
 .ELSE
     SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
 .ENDIF
-.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
 .ENDIF # "$(COM)"=="MSC"
 
 SHL1LIBS=
@@ -106,13 +104,11 @@ SHL2STDLIBS=\
     $(OLEAUT32LIB)
 
 .IF "$(COM)"=="MSC"
-.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
 .IF "$(USE_DEBUG_RUNTIME)" != ""
     SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
 .ELSE
     SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
 .ENDIF
-.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
 .ENDIF # "$(COM)"=="MSC"
 
 SHL2LIBS=