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

trunk/kBuild/sdks/DXSDKAMD64.kmk

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