Changeset 692 for trunk/kBuild/sdks/WIN32SDK.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/WIN32SDK.kmk (modified) (1 diff)

trunk/kBuild/sdks/WIN32SDK.kmk

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