diff options
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/set_wntx64.mk | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | solenv/inc/wntgcci.mk | 17 | ||||
| -rw-r--r--[-rwxr-xr-x] | solenv/inc/wntmsc.mk | 1 |
3 files changed, 9 insertions, 12 deletions
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 971dd650b61d..bc8fb7445dfd 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -114,7 +114,7 @@ STDSLOCUI_X64= IMPLIBFLAGS_X64=-machine:X64 -LIBPATH_X64=$(PSDK_HOME)/lib/x64 +LIBPATH_X64=$(WINDOWS_SDK_HOME)/lib/x64 LIBPATH_VC_X64=$(COMPATH)/lib/amd64 ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib @@ -127,7 +127,6 @@ WINSPOOLLIB_X64=$(LIBPATH_X64)/winspool.lib IMM32LIB_X64=$(LIBPATH_X64)/imm32.lib VERSIONLIB_X64=$(LIBPATH_X64)/version.lib WINMMLIB_X64=$(LIBPATH_X64)/winmm.lib -WSOCK32LIB_X64=$(LIBPATH_X64)/wsock32.lib MPRLIB_X64=$(LIBPATH_X64)/mpr.lib WS2_32LIB_X64=$(LIBPATH_X64)/ws2_32.lib KERNEL32LIB_X64=$(LIBPATH_X64)/kernel32.lib 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 diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 1276f773e336..7811d13f1eb9 100755..100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -367,7 +367,6 @@ WINSPOOLLIB=winspool.lib IMM32LIB=imm32.lib VERSIONLIB=version.lib WINMMLIB=winmm.lib -WSOCK32LIB=wsock32.lib MPRLIB=mpr.lib WS2_32LIB=ws2_32.lib KERNEL32LIB=kernel32.lib |