Changeset 702 for trunk


Ignore:
Timestamp:
Dec 10, 2006, 9:27:54 AM (19 years ago)
Author:
bird
Message:

Deal with shifting case standard in the PSDK.

Location:
trunk/kBuild/sdks
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/sdks/WIN32SDK.kmk

    r692 r702  
    4646 endif
    4747endif
    48 PATH_SDK_WIN32SDK_INC ?= $(PATH_SDK_WIN32SDK)/include
    49 PATH_SDK_WIN32SDK_LIB ?= $(PATH_SDK_WIN32SDK)/lib
     48ifndef PATH_SDK_WIN32SDK_INC
     49PATH_SDK_WIN32SDK_INC := $(firstword $(wildcard $(PATH_SDK_WIN32SDK)/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]) $(PATH_SDK_WIN32SDK)/Include)
     50endif
     51ifndef PATH_SDK_WIN32SDK_LIB
     52PATH_SDK_WIN32SDK_LIB := $(firstword $(wildcard $(PATH_SDK_WIN32SDK)/[Ll][Ii][Bb]) $(PATH_SDK_WIN32SDK)/Lib)
     53endif
     54ifndef PATH_SDK_WIN32SDK_BIN
     55PATH_SDK_WIN32SDK_BIN := $(firstword $(wildcard $(PATH_SDK_WIN32SDK)/[Bb][Ii][Nn]) $(PATH_SDK_WIN32SDK)/Bin)
     56endif
     57
    5058
    5159# General Properties used by kBuild

  • trunk/kBuild/sdks/WIN64SDK.kmk

    r692 r702  
    5050 PATH_SDK_WIN64SDK := $(PATH_SDK_WIN64SDK)
    5151endif
    52 PATH_SDK_WIN64SDK_INC ?= $(PATH_SDK_WIN64SDK)/include
    53 PATH_SDK_WIN64SDK_LIB ?= $(PATH_SDK_WIN64SDK)/lib/AMD64
     52ifndef PATH_SDK_WIN64SDK_INC
     53PATH_SDK_WIN64SDK_INC := $(firstword $(wildcard $(PATH_SDK_WIN64SDK)/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]) $(PATH_SDK_WIN64SDK)/Include)
     54endif
     55
     56ifndef PATH_SDK_WIN64SDK_LIB
     57PATH_SDK_WIN64SDK_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WIN64SDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WIN64SDK)/Lib/AMD64)
     58endif
     59
     60ifndef PATH_SDK_WIN64SDK_BIN
     61PATH_SDK_WIN64SDK_BIN := $(firstword $(wildcard $(PATH_SDK_WIN64SDK)/[Bb][Ii][Nn]) $(PATH_SDK_WIN64SDK)/Bin)
     62endif
     63ifndef PATH_SDK_WIN64SDK_BIN_AMD64
     64PATH_SDK_WIN64SDK_BIN_AMD64 := $(firstword $(wildcard $(PATH_SDK_WIN64SDK_BIN)/[Ww][Ii][Nn]64/[Xx]86/[Aa][Mm][Dd]64) $(PATH_SDK_WIN64SDK_BIN)/win64/AMD64)
     65endif
     66
    5467
    5568# General Properties used by kBuild

  • trunk/kBuild/sdks/WINPSDK.kmk

    r692 r702  
    5151 PATH_SDK_WINPSDK := $(PATH_SDK_WINPSDK)
    5252endif
    53 PATH_SDK_WINPSDK_INC ?= $(PATH_SDK_WINPSDK)/include
    54 PATH_SDK_WINPSDK_LIB.x86 ?= $(PATH_SDK_WINPSDK)/lib
    55 PATH_SDK_WINPSDK_LIB.amd64 ?= $(PATH_SDK_WINPSDK)/lib
     53
     54ifndef PATH_SDK_WINPSDK_INC
     55PATH_SDK_WINPSDK_INC := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]) $(PATH_SDK_WINPSDK)/Include)
     56endif
     57
     58ifndef PATH_SDK_WINPSDK_LIB.x86
     59PATH_SDK_WINPSDK_LIB.x86 := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]) $(PATH_SDK_WINPSDK)/Lib)
     60endif
     61ifndef PATH_SDK_WINPSDK_LIB.amd64
     62PATH_SDK_WINPSDK_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDK)/Lib/AMD64)
     63endif
    5664PATH_SDK_WINPSDK_LIB ?= $(PATH_SDK_WINPSDK_LIB.$(BUILD_TARGET_ARCH))
    57 PATH_SDK_WINPSDK_BIN ?= $(PATH_SDK_WINPSDK)/bin
    58 PATH_SDK_WINPSDK_BIN_AMD64 ?= $(PATH_SDK_WINPSDK)/bin/win64/x86/AMD64
    59 PATH_SDK_WINPSDK_BIN_IA64 ?= $(PATH_SDK_WINPSDK)/bin/win64/
     65
     66ifndef PATH_SDK_WINPSDK_BIN
     67PATH_SDK_WINPSDK_BIN := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Bb][Ii][Nn]) $(PATH_SDK_WINPSDK)/Bin)
     68endif
     69ifndef PATH_SDK_WINPSDK_BIN_AMD64
     70PATH_SDK_WINPSDK_BIN_AMD64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK_BIN)/[Ww][Ii][Nn]64/[Xx]86/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDK_BIN)/win64/AMD64)
     71endif
     72ifndef PATH_SDK_WINPSDK_BIN_IA64
     73PATH_SDK_WINPSDK_BIN_IA64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK_BIN)/[Ww][Ii][Nn]64) $(PATH_SDK_WINPSDK_BIN)/win64)
     74endif
     75
    6076
    6177# General Properties used by kBuild

  • trunk/kBuild/sdks/WINPSDKINCS.kmk

    r692 r702  
    5959 PATH_SDK_WINPSDKINCS := $(PATH_SDK_WINPSDKINCS)
    6060endif
    61 PATH_SDK_WINPSDKINCS_INC ?= $(PATH_SDK_WINPSDKINCS)/include
    62 PATH_SDK_WINPSDKINCS_LIB.x86 ?= $(PATH_SDK_WINPSDKINCS)/lib
    63 PATH_SDK_WINPSDKINCS_LIB.amd64 ?= $(PATH_SDK_WINPSDKINCS)/lib
     61ifndef PATH_SDK_WINPSDKINCS_INC
     62PATH_SDK_WINPSDKINCS_INC := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]) $(PATH_SDK_WINPSDKINCS)/Include)
     63endif
     64
     65ifndef PATH_SDK_WINPSDKINCS_LIB.x86
     66PATH_SDK_WINPSDKINCS_LIB.x86 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Ll][Ii][Bb]) $(PATH_SDK_WINPSDKINCS)/Lib)
     67endif
     68ifndef PATH_SDK_WINPSDKINCS_LIB.amd64
     69PATH_SDK_WINPSDKINCS_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDKINCS)/Lib/AMD64)
     70endif
    6471PATH_SDK_WINPSDKINCS_LIB ?= $(PATH_SDK_WINPSDKINCS_LIB.$(BUILD_TARGET_ARCH))
    65 PATH_SDK_WINPSDKINCS_BIN ?= $(PATH_SDK_WINPSDKINCS)/bin
    66 PATH_SDK_WINPSDKINCS_BIN_AMD64 ?= $(PATH_SDK_WINPSDKINCS)/bin/win64/x86/AMD64
    67 PATH_SDK_WINPSDKINCS_BIN_IA64 ?= $(PATH_SDK_WINPSDKINCS)/bin/win64/
     72
     73ifndef PATH_SDK_WINPSDKINCS_BIN
     74PATH_SDK_WINPSDKINCS_BIN := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Bb][Ii][Nn]) $(PATH_SDK_WINPSDKINCS)/Bin)
     75endif
     76ifndef PATH_SDK_WINPSDKINCS_BIN_AMD64
     77PATH_SDK_WINPSDKINCS_BIN_AMD64 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS_BIN)/[Ww][Ii][Nn]64/[Xx]86/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDKINCS_BIN)/win64/AMD64)
     78endif
     79ifndef PATH_SDK_WINPSDKINCS_BIN_IA64
     80PATH_SDK_WINPSDKINCS_BIN_IA64 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS_BIN)/[Ww][Ii][Nn]64) $(PATH_SDK_WINPSDKINCS_BIN)/win64)
     81endif
     82
    6883
    6984# General Properties used by kBuild
Note: See TracChangeset for help on using the changeset viewer.