diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-16 15:52:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-16 16:01:30 +0300 |
| commit | 699d119f7825b5b44f6dd6e3915a0f9584078b69 (patch) | |
| tree | c65ee8ed4c86ba43eb26a518b643e28032f54ba1 /solenv/inc/wntgcci.mk | |
| parent | 0c5d3ca3e40c60322c1d5eabc6c4a27df96b1c09 (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.
Diffstat (limited to 'solenv/inc/wntgcci.mk')
| -rw-r--r--[-rwxr-xr-x] | solenv/inc/wntgcci.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 531b4baef719..b008dd8bc92c 100755..100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -186,12 +186,11 @@ SHELL32LIB=-lshell32 GDI32LIB=-lgdi32 OLE32LIB=-lole32 OLEAUT32LIB=-loleaut32 -UUIDLIB=$(PSDK_HOME)$/lib$/uuid.lib +UUIDLIB=$(WINDOWS_SDK_HOME)$/lib$/uuid.lib WINSPOOLLIB=-lwinspool IMM32LIB=-limm32 VERSIONLIB=-lversion WINMMLIB=-lwinmm -WSOCK32LIB=-lwsock32 MPRLIB=-lmpr WS2_32LIB=-lws2_32 KERNEL32LIB=-lkernel32 @@ -199,14 +198,14 @@ USER32LIB=-luser32 LIBCMT=-lmsvcrt COMDLG32LIB=-lcomdlg32 COMCTL32LIB=-lcomctl32 -CRYPT32LIB=$(PSDK_HOME)$/lib$/crypt32.lib -GDIPLUSLIB=$(PSDK_HOME)$/lib$/gdiplus.lib -DBGHELPLIB=$(PSDK_HOME)$/lib$/dbghelp.lib -MSILIB=$(PSDK_HOME)$/lib$/msi.lib +CRYPT32LIB=$(WINDOWS_SDK_HOME)$/lib$/crypt32.lib +GDIPLUSLIB=$(WINDOWS_SDK_HOME)$/lib$/gdiplus.lib +DBGHELPLIB=$(WINDOWS_SDK_HOME)$/lib$/dbghelp.lib +MSILIB=$(WINDOWS_SDK_HOME)$/lib$/msi.lib DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib -SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib -URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib +SHLWAPILIB=$(WINDOWS_SDK_HOME)$/lib$/shlwapi.lib +URLMONLIB=$(WINDOWS_SDK_HOME)$/lib$/urlmon.lib WININETLIB=-lwininet OLDNAMESLIB=-lmoldname -MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib +MSIMG32LIB=$(WINDOWS_SDK_HOME)$/lib$/msimg32.lib PROPSYSLIB=-lpropsys |