Kaydet (Commit) ca4d3098 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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.
üst 1bb5d166
...@@ -67,7 +67,7 @@ STDLIB1=\ ...@@ -67,7 +67,7 @@ STDLIB1=\
$(COMCTL32LIB)\ $(COMCTL32LIB)\
$(COMDLG32LIB)\ $(COMDLG32LIB)\
$(ADVAPI32LIB)\ $(ADVAPI32LIB)\
$(WSOCK32LIB)\ $(WS2_32LIB)\
$(SHELL32LIB)\ $(SHELL32LIB)\
$(DBGHELPLIB)\ $(DBGHELPLIB)\
psapi.lib psapi.lib
......
...@@ -74,11 +74,9 @@ SHL1STDLIBS+=\ ...@@ -74,11 +74,9 @@ SHL1STDLIBS+=\
$(ATL_LIB)$/atls.lib $(ATL_LIB)$/atls.lib
.ENDIF .ENDIF
.IF "$(WINDOWS_VISTA_PSDK)"!=""
SHL1STDLIBS+=\ SHL1STDLIBS+=\
$(ADVAPI32LIB) \ $(ADVAPI32LIB) \
$(ATL_LIB)$/atls.lib $(ATL_LIB)$/atls.lib
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!=""
.ENDIF # "$(COM)"=="MSC" .ENDIF # "$(COM)"=="MSC"
......
...@@ -79,13 +79,11 @@ SHL1STDLIBS=\ ...@@ -79,13 +79,11 @@ SHL1STDLIBS=\
$(OLEAUT32LIB) $(OLEAUT32LIB)
.IF "$(COM)"=="MSC" .IF "$(COM)"=="MSC"
.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.IF "$(USE_DEBUG_RUNTIME)" != "" .IF "$(USE_DEBUG_RUNTIME)" != ""
SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
.ELSE .ELSE
SHL1STDLIBS+= $(ATL_LIB)$/atls.lib SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
.ENDIF .ENDIF
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.ENDIF # "$(COM)"=="MSC" .ENDIF # "$(COM)"=="MSC"
SHL1LIBS= SHL1LIBS=
...@@ -106,13 +104,11 @@ SHL2STDLIBS=\ ...@@ -106,13 +104,11 @@ SHL2STDLIBS=\
$(OLEAUT32LIB) $(OLEAUT32LIB)
.IF "$(COM)"=="MSC" .IF "$(COM)"=="MSC"
.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.IF "$(USE_DEBUG_RUNTIME)" != "" .IF "$(USE_DEBUG_RUNTIME)" != ""
SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
.ELSE .ELSE
SHL2STDLIBS+= $(ATL_LIB)$/atls.lib SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
.ENDIF .ENDIF
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.ENDIF # "$(COM)"=="MSC" .ENDIF # "$(COM)"=="MSC"
SHL2LIBS= SHL2LIBS=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment