Changeset 1504 for trunk/kBuild/sdks

Timestamp:

Apr 9, 2008, 2:04:42 AM (17 years ago)

Author:

bird

Message:

Environment / global variable policy changes. Renamed the following but will continue to check for the old ones:
BUILD_TYPE -> KBUILD_TYPE
BUILD_TARGET -> KBUILD_TARGET
BUILD_TARGET_ARCH -> KBUILD_TARGET_ARCH
BUILD_TARGET_CPU -> KBUILD_TARGET_CPU
BUILD_PLATFORM -> KBUILD_HOST
BUILD_PLATFORM_ARCH -> KBUILD_HOST_ARCH
BUILD_PLATFORM_CPU -> KBUILD_HOST_CPU
PATH_KBUILD -> KBUILD_PATH
PATH_KBUILD_BIN -> KBUILD_BIN_PATH

Location:

trunk/kBuild/sdks

Files:

• DXSDK.kmk (modified) (3 diffs)
• LIBSDL.kmk (modified) (8 diffs)
• W2K3DDK.kmk (modified) (3 diffs)
• WINPSDK.kmk (modified) (3 diffs)
• WINPSDKINCS.kmk (modified) (3 diffs)

trunk/kBuild/sdks/DXSDK.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild SDK - The Microsoft Direct X SDK, targeting $(BUILD_TARGET).
+# kBuild SDK - The Microsoft Direct X SDK, targeting $(KBUILD_TARGET).
 #
 # Copyright (c) 2006-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
@@ -25 +25 @@
 #
 
-SDK_DXSDK := The Microsoft Direct X SDK, targeting $(BUILD_TARGET)
+SDK_DXSDK := The Microsoft Direct X SDK, targeting $(KBUILD_TARGET)
 
 # SDK Specific Properties
@@ -53 +53 @@
 PATH_SDK_DXSDK_LIB.x86 ?= $(PATH_SDK_DXSDK)/Lib/x86
 PATH_SDK_DXSDK_LIB.amd64 ?= $(PATH_SDK_DXSDK)/Lib/x64
-PATH_SDK_DXSDK_LIB ?= $(PATH_SDK_DXSDK_LIB.$(BUILD_TARGET_ARCH))
+PATH_SDK_DXSDK_LIB ?= $(PATH_SDK_DXSDK_LIB.$(KBUILD_TARGET_ARCH))
 
 # General Properties used by kBuild

trunk/kBuild/sdks/LIBSDL.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild SDK - Simple DirectMedia Layer, targeting $(BUILD_TARGET).
+# kBuild SDK - Simple DirectMedia Layer, targeting $(KBUILD_TARGET).
 #
 # Copyright (c) 2006-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
@@ -25 +25 @@
 #
 
-SDK_LIBSDL := Simple DirectMedia Layer, targeting $(BUILD_TARGET).
+SDK_LIBSDL := Simple DirectMedia Layer, targeting $(KBUILD_TARGET).
 
 # SDK Specific Properties
@@ -39 +39 @@
 
   # Darwin might have a framework for it.
-  ifeq ($(BUILD_TARGET),darwin)
+  ifeq ($(KBUILD_TARGET),darwin)
    PATH_SDK_LIBSDL := $(firstword $(wildcard \
         /System/Library/Frameworks/SDL.frameworks/SDL \
@@ -52 +52 @@
   ifeq ($(PATH_SDK_LIBSDL),)
    # Search in the typical unix places.
-   ifeq ($(filter-out %64,$(BUILD_TARGET_ARCH)),)
+   ifeq ($(filter-out %64,$(KBUILD_TARGET_ARCH)),)
     PATH_SDK_LIBSDL := $(firstword $(wildcard \
         /lib64/libSDL.* \
@@ -93 +93 @@
 else
  PATH_SDK_LIBSDL := $(PATH_SDK_LIBSDL)
- ifeq ($(BUILD_TARGET),darwin)
+ ifeq ($(KBUILD_TARGET),darwin)
   # Check if it's the framework or not.
   _SDK_LIBSDK_IS_FRAMEWORK := $(if $(wildcard $(PATH_SDK_LIBSDL)/Headers/SDL.h),yes)
@@ -103 +103 @@
 # varies quite a bit, thus this kludge.
 #
-ifeq ($(BUILD_TARGET),os2)
+ifeq ($(KBUILD_TARGET),os2)
  LIB_SDK_LIBSDL_SDLMAIN  ?=
  DLL_SDK_LIBSDL_SDL      ?= $(PATH_SDK_LIBSDL)/SDL/SDL12.dll
@@ -132 +132 @@
         $(PATH_SDK_LIBSDL)/SDLTTF
 
-else ifeq ($(BUILD_TARGET),win) # ASSUMES VC++ on windows, sorry.
+else ifeq ($(KBUILD_TARGET),win) # ASSUMES VC++ on windows, sorry.
  LIB_SDK_LIBSDL_SDLMAIN  ?= $(PATH_SDK_LIBSDL)/lib/SDLmain.lib
  LIB_SDK_LIBSDL_SDL      ?= $(PATH_SDK_LIBSDL)/lib/SDL.lib
@@ -152 +152 @@
         $(PATH_SDK_LIBSDL)/lib
 
-else ifeq ($(BUILD_TARGET).$(_SDK_LIBSDK_IS_FRAMEWORK),darwin.yes)
+else ifeq ($(KBUILD_TARGET).$(_SDK_LIBSDK_IS_FRAMEWORK),darwin.yes)
  # darwin + framework
  LIB_SDK_LIBSDL_SDLMAIN  ?= $(NO_SUCH_VARIABLE)

trunk/kBuild/sdks/W2K3DDK.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild SDK - The Microsoft Windows 2003 DDK, targeting $(BUILD_TARGET).
+# kBuild SDK - The Microsoft Windows 2003 DDK, targeting $(KBUILD_TARGET).
 #
 # Copyright (c) 2006-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
@@ -25 +25 @@
 #
 
-SDK_W2K3DDK := The Microsoft Windows 2003 DDK, targeting $(BUILD_TARGET).
+SDK_W2K3DDK := The Microsoft Windows 2003 DDK, targeting $(KBUILD_TARGET).
 
 # SDK Specific Properties
@@ -60 +60 @@
 PATH_SDK_W2K3DDK_LIB.amd64 ?= $(PATH_SDK_W2K3DDK)/lib/wnet/AMD64
 PATH_SDK_W2K3DDK_LIB.x86 ?= $(PATH_SDK_W2K3DDK)/lib/wnet/i386
-PATH_SDK_W2K3DDK_LIB ?= $(PATH_SDK_W2K3DDK_LIB.$(BUILD_TARGET_ARCH))
+PATH_SDK_W2K3DDK_LIB ?= $(PATH_SDK_W2K3DDK_LIB.$(KBUILD_TARGET_ARCH))
 
 # General Properties used by kBuild

trunk/kBuild/sdks/WINPSDK.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild SDK - The Windows Platform SDK, targeting (BUILD_TARGET).
+# kBuild SDK - The Windows Platform SDK, targeting (KBUILD_TARGET).
 #
 # Copyright (c) 2006-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
@@ -25 +25 @@
 #
 
-SDK_WINPSDK := The Windows Platform SDK, targeting (BUILD_TARGET).
+SDK_WINPSDK := The Windows Platform SDK, targeting (KBUILD_TARGET).
 
 # SDK Specific Properties
@@ -62 +62 @@
 PATH_SDK_WINPSDK_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64 $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[xX]64) $(PATH_SDK_WINPSDK)/Lib/AMD64)
 endif
-PATH_SDK_WINPSDK_LIB ?= $(PATH_SDK_WINPSDK_LIB.$(BUILD_TARGET_ARCH))
+PATH_SDK_WINPSDK_LIB ?= $(PATH_SDK_WINPSDK_LIB.$(KBUILD_TARGET_ARCH))
 
 ifndef PATH_SDK_WINPSDK_BIN

trunk/kBuild/sdks/WINPSDKINCS.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild SDK - The Windows Platform SDK, targeting (BUILD_TARGET) but
+# kBuild SDK - The Windows Platform SDK, targeting (KBUILD_TARGET) but
 #              without any libraries or LIBPATH properties.
 #              Basically for finding specstrings.h when using the DDK.
@@ -27 +27 @@
 #
 
-SDK_WINPSDKINCS := The Windows Platform SDK, targeting (BUILD_TARGET) but \
+SDK_WINPSDKINCS := The Windows Platform SDK, targeting (KBUILD_TARGET) but \
         without any library or LIBPATH properties. \
         Basically for finding specstrings.h when using the DDK.
@@ -69 +69 @@
 PATH_SDK_WINPSDKINCS_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDKINCS)/Lib/AMD64)
 endif
-PATH_SDK_WINPSDKINCS_LIB ?= $(PATH_SDK_WINPSDKINCS_LIB.$(BUILD_TARGET_ARCH))
+PATH_SDK_WINPSDKINCS_LIB ?= $(PATH_SDK_WINPSDKINCS_LIB.$(KBUILD_TARGET_ARCH))
 
 ifndef PATH_SDK_WINPSDKINCS_BIN