Changeset 1371 for trunk/kBuild

Timestamp:

Dec 14, 2007, 2:56:13 AM (18 years ago)

Author:

bird

Message:

Deal with the vista PSDK (lib/amd64 -> lib/x64 and some similar stuff for bin).

Location:

trunk/kBuild/sdks

Files:

• WIN64SDK.kmk (modified) (2 diffs)
• WINPSDK.kmk (modified) (2 diffs)

trunk/kBuild/sdks/WIN64SDK.kmk

@@ -52 +52 @@
 
 ifndef PATH_SDK_WIN64SDK_LIB
-PATH_SDK_WIN64SDK_LIB := $(firstword $(wildcard $(PATH_SDK_WIN64SDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WIN64SDK)/Lib/AMD64)
+PATH_SDK_WIN64SDK_LIB := $(firstword $(wildcard $(PATH_SDK_WIN64SDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64 $(PATH_SDK_WIN64SDK)/[Ll][Ii][Bb]/[xX]64) $(PATH_SDK_WIN64SDK)/Lib/AMD64)
 endif
 
@@ -59 +59 @@
 endif
 ifndef PATH_SDK_WIN64SDK_BIN_AMD64
-PATH_SDK_WIN64SDK_BIN_AMD64 := $(firstword $(wildcard $(PATH_SDK_WIN64SDK_BIN)/[Ww][Ii][Nn]64/[Xx]86/[Aa][Mm][Dd]64) $(PATH_SDK_WIN64SDK_BIN)/win64/AMD64)
+PATH_SDK_WIN64SDK_BIN_AMD64 := $(firstword $(wildcard $(PATH_SDK_WIN64SDK_BIN)/[Ww][Ii][Nn]64/[Xx]86/[Aa][Mm][Dd]64 $(PATH_SDK_WIN64SDK_BIN)/[Ww][Ii][Nn]64/[Xx]86) $(PATH_SDK_WIN64SDK_BIN)/win64/AMD64)
 endif
 

trunk/kBuild/sdks/WINPSDK.kmk

@@ -60 +60 @@
 endif
 ifndef PATH_SDK_WINPSDK_LIB.amd64
-PATH_SDK_WINPSDK_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDK)/Lib/AMD64)
+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
 PATH_SDK_WINPSDK_LIB ?= $(PATH_SDK_WINPSDK_LIB.$(BUILD_TARGET_ARCH))
@@ -68 +68 @@
 endif
 ifndef PATH_SDK_WINPSDK_BIN_AMD64
-PATH_SDK_WINPSDK_BIN_AMD64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK_BIN)/[Ww][Ii][Nn]64/[Xx]86/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDK_BIN)/win64/AMD64)
+PATH_SDK_WINPSDK_BIN_AMD64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK_BIN)/[Ww][Ii][Nn]64/[Xx]86/[Aa][Mm][Dd]64 $(PATH_SDK_WINPSDK_BIN)/[Ww][Ii][Nn]64/[Xx]86) $(PATH_SDK_WINPSDK_BIN)/win64/AMD64)
 endif
 ifndef PATH_SDK_WINPSDK_BIN_IA64