Changeset 664 for trunk/kBuild/sdks/WIN32SDK.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/WIN32SDK.kmk (modified) (3 diffs, 1 prop)

trunk/kBuild/sdks/WIN32SDK.kmk

@@ -1 @@
-# $Id: W32API.kmk 132 2004-06-30 20:29:28Z bird $
+# $Id$
 ## @file
 #
-# kBuild SDK - Windows Platform SDK.
+# kBuild SDK - The Windows Platform SDK, targeting x86.
 #
 # Copyright (c) 2006 knut st. osmundsen <bird-srcspam@anduin.net>
@@ -25 +25 @@
 #
 
+SDK_WIN32SDK := The Windows Platform SDK, targeting x86.
 
-SDK_WIN32SDK          := Win32 Platform SDK
+# SDK Specific Properties
 ifndef PATH_SDK_WIN32SDK
- PATH_SDK_WIN32SDK    := $(sort $(wildcard $(PATH_DEV)/x86.win32/sdk/2*))
+ PATH_SDK_WIN32SDK := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2*))
+ ifeq ($(PATH_SDK_WIN32SDK),)
+  PATH_SDK_WIN32SDK := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*))
+ endif
+ ifeq ($(PATH_SDK_WIN32SDK),)
+  PATH_SDK_WIN32SDK := $(sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/sdk/2*))
+ endif
  ifneq ($(PATH_SDK_WIN32SDK),)
-  PATH_SDK_WIN32SDK   := $(call lastword,$(PATH_SDK_WIN32SDK))
+  PATH_SDK_WIN32SDK := $(call lastword,$(PATH_SDK_WIN32SDK))
  else
   $(warning kBuild: PATH_SDK_WIN32SDK couldn't be determined!)
-  PATH_SDK_WIN32SDK   := $(PATH_DEV)/x86.win32/sdk/not/found
+  PATH_SDK_WIN32SDK := $(PATH_DEVTOOLS)/x86.win32/sdk/not/found
  endif
 endif
@@ -39 +46 @@
 PATH_SDK_WIN32SDK_LIB ?= $(PATH_SDK_WIN32SDK)/lib
 
-SDK_WIN32SDK_INCS     ?= $(PATH_SDK_WIN32SDK_INC)
-SDK_WIN32SDK_LIBPATH  ?= $(PATH_SDK_WIN32SDK_LIB)
-SDK_WIN32SDK_LIBS     ?= \
+# General Properties used by kBuild
+SDK_WIN32SDK_INCS ?= $(PATH_SDK_WIN32SDK_INC)
+SDK_WIN32SDK_LIBPATH ?= $(PATH_SDK_WIN32SDK_LIB)
+SDK_WIN32SDK_LIBS ?= \
         $(PATH_SDK_WIN32SDK_LIB)/Kernel32.Lib \
         $(PATH_SDK_WIN32SDK_LIB)/User32.Lib \