Changeset 692 for trunk/kBuild/sdks/W2K3DDKX86.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/W2K3DDKX86.kmk (modified) (2 diffs)

trunk/kBuild/sdks/W2K3DDKX86.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild SDK - The Microsoft Windows 2003 DDK, targeting X86.
+# kBuild SDK - The Microsoft Windows 2003 DDK, targeting x86.
 #
 # Copyright (c) 2006 knut st. osmundsen <bird-srcspam@anduin.net>
@@ -25 +25 @@
 #
 
-SDK_W2K3DDKX86 := The Microsoft Windows 2003 DDK, targeting X86.
+SDK_W2K3DDKX86 := The Microsoft Windows 2003 DDK, targeting x86.
 
 # SDK Specific Properties
 ifndef PATH_SDK_W2K3DDKX86
- PATH_SDK_W2K3DDKX86 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/ddkwin2k3/2*))
+ PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*)
  ifeq ($(PATH_SDK_W2K3DDKX86),)
-  PATH_SDK_W2K3DDKX86 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*))
+  PATH_SDK_W2K3DDKX86 := $(PATH_SDK_W2K3DDK)
  endif
  ifeq ($(PATH_SDK_W2K3DDKX86),)
-  PATH_SDK_W2K3DDKX86 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3))
+  PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
+ endif
+ # legacy:
+ ifeq ($(PATH_SDK_W2K3DDKX86),)
+  PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
  endif
  ifeq ($(PATH_SDK_W2K3DDKX86),)
-  PATH_SDK_W2K3DDKX86 := $(sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/ddkwin2k3/2*))
+  PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3)
  endif
  ifneq ($(PATH_SDK_W2K3DDKX86),)
-  PATH_SDK_W2K3DDKX86 := $(call lastword,$(PATH_SDK_W2K3DDKX86))
+  PATH_SDK_W2K3DDKX86 := $(lastword $(sort $(PATH_SDK_W2K3DDKX86)))
  else
   $(warning kBuild: PATH_SDK_W2K3DDKX86 couldn't be determined!)