Changeset 2430 for trunk/kBuild

Timestamp:

Nov 16, 2010, 4:26:34 PM (15 years ago)

Author:

bird

Message:

WINPSDK: use .x86,.amd64 and .ia64 props. Fixes #100.

File:

• trunk/kBuild/sdks/WINPSDK.kmk (modified) (2 diffs)

trunk/kBuild/sdks/WINPSDK.kmk

@@ -69 +69 @@
 PATH_SDK_WINPSDK_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64 $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[xX]64) $(PATH_SDK_WINPSDK)/Lib/AMD64)
 endif
+ifndef PATH_SDK_WINPSDK_LIB.ia64
+PATH_SDK_WINPSDK_LIB.ia64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[Ii][Aa]64) $(PATH_SDK_WINPSDK)/Lib/IA64)
+endif
 PATH_SDK_WINPSDK_LIB ?= $(PATH_SDK_WINPSDK_LIB.$(KBUILD_TARGET_ARCH))
 
@@ -84 +87 @@
 # General Properties used by kBuild
 SDK_WINPSDK_INCS ?= $(PATH_SDK_WINPSDK_INC)
-SDK_WINPSDK_LIBPATH ?= $(PATH_SDK_WINPSDK_LIB)
-SDK_WINPSDK_LIBS ?= \
-        $(PATH_SDK_WINPSDK_LIB)/Kernel32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/User32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/Gdi32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/AdvAPI32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/Shell32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/ShLwApi.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/SetupAPI.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/Uuid.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/Version.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/WS2_32.Lib \
+SDK_WINPSDK_LIBPATH.x86   ?= $(PATH_SDK_WINPSDK_LIB.x86)
+SDK_WINPSDK_LIBPATH.amd64 ?= $(PATH_SDK_WINPSDK_LIB.amd64)
+SDK_WINPSDK_LIBPATH.ia64  ?= $(PATH_SDK_WINPSDK_LIB.ia64)
+SDK_WINPSDK_LIBS.x86 ?= \
+        $(PATH_SDK_WINPSDK_LIB.x86)/Kernel32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/User32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/Gdi32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/AdvAPI32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/Shell32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/ShLwApi.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/SetupAPI.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/Uuid.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/Version.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/WS2_32.Lib \
         \
-        $(PATH_SDK_WINPSDK_LIB)/Ole32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/OleAut32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/OleDlg.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/RpcRT4.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/Ole32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/OleAut32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/OleDlg.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/RpcRT4.Lib \
         \
-        $(PATH_SDK_WINPSDK_LIB)/DbgHelp.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/ImageHlp.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/IPHlpApi.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/ComCtl32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/ComDlg32.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/WinSpool.Lib \
-        $(PATH_SDK_WINPSDK_LIB)/WinMM.Lib
+        $(PATH_SDK_WINPSDK_LIB.x86)/DbgHelp.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/ImageHlp.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/IPHlpApi.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/ComCtl32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/ComDlg32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/WinSpool.Lib \
+        $(PATH_SDK_WINPSDK_LIB.x86)/WinMM.Lib
+SDK_WINPSDK_LIBS.amd64 ?= \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/Kernel32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/User32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/Gdi32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/AdvAPI32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/Shell32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/ShLwApi.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/SetupAPI.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/Uuid.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/Version.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/WS2_32.Lib \
+        \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/Ole32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/OleAut32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/OleDlg.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/RpcRT4.Lib \
+        \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/DbgHelp.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/ImageHlp.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/IPHlpApi.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/ComCtl32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/ComDlg32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/WinSpool.Lib \
+        $(PATH_SDK_WINPSDK_LIB.amd64)/WinMM.Lib
+SDK_WINPSDK_LIBS.ia64 ?= \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/Kernel32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/User32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/Gdi32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/AdvAPI32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/Shell32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/ShLwApi.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/SetupAPI.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/Uuid.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/Version.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/WS2_32.Lib \
+        \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/Ole32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/OleAut32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/OleDlg.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/RpcRT4.Lib \
+        \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/DbgHelp.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/ImageHlp.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/IPHlpApi.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/ComCtl32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/ComDlg32.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/WinSpool.Lib \
+        $(PATH_SDK_WINPSDK_LIB.ia64)/WinMM.Lib