Changeset 702 for trunk/kBuild/sdks/WINPSDKINCS.kmk

Timestamp:

Dec 10, 2006, 9:27:54 AM (19 years ago)

Author:

bird

Message:

Deal with shifting case standard in the PSDK.

File:

• trunk/kBuild/sdks/WINPSDKINCS.kmk (modified) (1 diff)

trunk/kBuild/sdks/WINPSDKINCS.kmk

@@ -59 +59 @@
  PATH_SDK_WINPSDKINCS := $(PATH_SDK_WINPSDKINCS)
 endif
-PATH_SDK_WINPSDKINCS_INC ?= $(PATH_SDK_WINPSDKINCS)/include
-PATH_SDK_WINPSDKINCS_LIB.x86 ?= $(PATH_SDK_WINPSDKINCS)/lib
-PATH_SDK_WINPSDKINCS_LIB.amd64 ?= $(PATH_SDK_WINPSDKINCS)/lib
+ifndef PATH_SDK_WINPSDKINCS_INC
+PATH_SDK_WINPSDKINCS_INC := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]) $(PATH_SDK_WINPSDKINCS)/Include)
+endif
+
+ifndef PATH_SDK_WINPSDKINCS_LIB.x86
+PATH_SDK_WINPSDKINCS_LIB.x86 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Ll][Ii][Bb]) $(PATH_SDK_WINPSDKINCS)/Lib)
+endif
+ifndef PATH_SDK_WINPSDKINCS_LIB.amd64
+PATH_SDK_WINPSDKINCS_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDKINCS)/Lib/AMD64)
+endif
 PATH_SDK_WINPSDKINCS_LIB ?= $(PATH_SDK_WINPSDKINCS_LIB.$(BUILD_TARGET_ARCH))
-PATH_SDK_WINPSDKINCS_BIN ?= $(PATH_SDK_WINPSDKINCS)/bin
-PATH_SDK_WINPSDKINCS_BIN_AMD64 ?= $(PATH_SDK_WINPSDKINCS)/bin/win64/x86/AMD64
-PATH_SDK_WINPSDKINCS_BIN_IA64 ?= $(PATH_SDK_WINPSDKINCS)/bin/win64/
+
+ifndef PATH_SDK_WINPSDKINCS_BIN
+PATH_SDK_WINPSDKINCS_BIN := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Bb][Ii][Nn]) $(PATH_SDK_WINPSDKINCS)/Bin)
+endif
+ifndef PATH_SDK_WINPSDKINCS_BIN_AMD64
+PATH_SDK_WINPSDKINCS_BIN_AMD64 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS_BIN)/[Ww][Ii][Nn]64/[Xx]86/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDKINCS_BIN)/win64/AMD64)
+endif
+ifndef PATH_SDK_WINPSDKINCS_BIN_IA64
+PATH_SDK_WINPSDKINCS_BIN_IA64 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS_BIN)/[Ww][Ii][Nn]64) $(PATH_SDK_WINPSDKINCS_BIN)/win64)
+endif
+
 
 # General Properties used by kBuild