Changeset 664 for trunk/kBuild/sdks/DXSDKX86.kmk

Timestamp:

Dec 6, 2006, 3:14:43 AM (19 years ago)

Author:

bird

Message:

Two types of SDKs, BUILD_TARGET and target specific. The latter is for use with bldprogs and when doing cross compilation. Also renamed PATH_DEV to PATH_DEVTOOLS as that seems more self explanatory.

File:

• trunk/kBuild/sdks/DXSDKX86.kmk (modified) (2 diffs, 1 prop)

trunk/kBuild/sdks/DXSDKX86.kmk

@@ -1 @@
-# $Id: $
+# $Id$
 ## @file
 #
-# kBuild SDK - Direct X SDK, X86.
+# kBuild SDK - The Microsoft Direct X SDK, targeting X86.
 #
 # Copyright (c) 2006 knut st. osmundsen <bird-srcspam@anduin.net>
@@ -26 +26 @@
 
 
-SDK_DXSDKX86          := MicroSoft Direct X SDK, X86.
+SDK_DXSDKX86 := The Microsoft Direct X SDK, targeting X86.
+
+# SDK Specific Properties
 ifndef PATH_SDK_DXSDKX86
- PATH_SDK_DXSDKX86    := $(sort $(wildcard $(PATH_DEV)/x86.win32/dxsdk/2*))
+ PATH_SDK_DXSDKX86 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/dxsdk/2*))
+ ifeq ($(PATH_SDK_DXSDKX86),)
+  PATH_SDK_DXSDKX86 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/dxsdk/2*))
+ endif
+ ifeq ($(PATH_SDK_DXSDKX86),)
+  PATH_SDK_DXSDKX86 := $(sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/dxsdk/2*))
+ endif
  ifneq ($(PATH_SDK_DXSDKX86),)
-  PATH_SDK_DXSDKX86   := $(call lastword,$(PATH_SDK_DXSDKX86))
+  PATH_SDK_DXSDKX86 := $(call lastword,$(PATH_SDK_DXSDKX86))
  else
   $(warning kBuild: PATH_SDK_DXSDKX86 couldn't be determined!)
-  PATH_SDK_DXSDKX86   := $(PATH_DEV)/x86.win32/dxsdk/not/found
+  PATH_SDK_DXSDKX86 := $(PATH_DEVTOOLS)/x86.win/dxsdk/not/found
  endif
+else
+ # Resolve any fancy stuff once and for all.
+ PATH_SDK_DXSDKX86 := $(PATH_SDK_DXSDKX86)
 endif
 PATH_SDK_DXSDKX86_INC ?= $(PATH_SDK_DXSDKX86)/Include
 PATH_SDK_DXSDKX86_LIB ?= $(PATH_SDK_DXSDKX86)/Lib/x86
 
-SDK_DXSDKX86_INCS     ?= $(PATH_SDK_DXSDKX86_INC)
+# General Properties used by kBuild
+SDK_DXSDKX86_INCS ?= $(PATH_SDK_DXSDKX86_INC)
 SDK_DXSDKX86_LIBPATHS ?= $(PATH_SDK_DXSDKX86_LIB)