diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-16 15:55:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-16 15:55:15 +0300 |
| commit | ca4d30985c24ee960e9104be8e7f137627b043b0 (patch) | |
| tree | 2d7399c503114f2e8e28726de431548109b3b520 | |
| parent | 1bb5d16601e06afc030d638ddd41fb686dd2fa0f (diff) | |
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.
| -rw-r--r--[-rwxr-xr-x] | crashrep/source/win32/makefile.mk | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | embedserv/util/makefile.mk | 2 | ||||
| -rw-r--r-- | extensions/source/ole/makefile.mk | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/crashrep/source/win32/makefile.mk b/crashrep/source/win32/makefile.mk index 2f8aef7239a8..21c0ab390a0b 100755..100644 --- 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 index 5af210d96029..1f8ad8a90baf 100755..100644 --- 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 58a2cc7f0453..a9ff68118c58 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= |