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

Timestamp:

Dec 8, 2006, 11:31:16 PM (19 years ago)

Author:

bird

Message:

tools location is being cleaned up.

File:

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

trunk/kBuild/sdks/WINPSDKINCS.kmk

@@ -33 +33 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WINPSDKINCS
- PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*))
- ifeq ($(PATH_SDK_WINPSDKINCS),)
-  PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*))
- endif
- ifeq ($(PATH_SDK_WINPSDKINCS),)
-  PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2*))
- endif
- ifeq ($(PATH_SDK_WINPSDKINCS),)
-  PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*))
- endif
- ifeq ($(PATH_SDK_WINPSDKINCS),)
-  PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/sdk/2*))
- endif
- ifneq ($(PATH_SDK_WINPSDKINCS),)
-  PATH_SDK_WINPSDKINCS := $(call lastword,$(PATH_SDK_WINPSDKINCS))
+ ifdef PATH_SDK_WINPSDK
+  PATH_SDK_WINPSDKINCS := $(PATH_SDK_WINPSDK)
  else
-  $(warning kBuild: PATH_SDK_WINPSDKINCS couldn't be determined!)
-  PATH_SDK_WINPSDKINCS := $(PATH_DEVTOOLS_BLD)/sdk//not/found
+  PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*)
+  ifeq ($(PATH_SDK_WINPSDKINCS),)
+   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*)
+  endif
+  ifeq ($(PATH_SDK_WINPSDKINCS),)
+   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
+  endif
+  ifeq ($(PATH_SDK_WINPSDKINCS),)
+   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*)
+  endif
+  ifeq ($(PATH_SDK_WINPSDKINCS),)
+   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
+  endif
+  ifneq ($(PATH_SDK_WINPSDKINCS),)
+   PATH_SDK_WINPSDKINCS := $(lastword $(sort $(PATH_SDK_WINPSDKINCS)))
+  else
+   $(warning kBuild: PATH_SDK_WINPSDKINCS couldn't be determined!)
+   PATH_SDK_WINPSDKINCS := $(PATH_DEVTOOLS_BLD)/sdk/not/found
+  endif
  endif
 else