Changeset 3418


Ignore:
Timestamp:
Aug 21, 2020, 1:02:13 PM (5 years ago)
Author:
bird
Message:

sdks/*,units/qt3.kmk: s/PATH_DEVTOOLS/KBUILD_DEVTOOLS/g

Location:
trunk/kBuild
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/sdks/DXSDK.kmk

    r3121 r3418  
    3737ifndef PATH_SDK_DXSDK
    3838 ## @todo which order is logical here, BLD and then TRG or the other way?
    39  PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/dxsdk/2*))
     39 PATH_SDK_DXSDK := $(sort $(wildcard $(KBUILD_DEVTOOLS_BLD)/dxsdk/2*))
    4040 ifeq ($(PATH_SDK_DXSDK),)
    41   PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/dxsdk/2*))
     41  PATH_SDK_DXSDK := $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/dxsdk/2*))
    4242 endif
    4343 ifeq ($(PATH_SDK_DXSDK),)
    44   PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*))
     44  PATH_SDK_DXSDK := $(sort $(wildcard $(KBUILD_DEVTOOLS)/win.x86/dxsdk/2*))
    4545 endif
    4646 ifeq ($(PATH_SDK_DXSDK),)
    47   PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/win.amd64/dxsdk/2*))
     47  PATH_SDK_DXSDK := $(sort $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/dxsdk/2*))
    4848 endif
    4949 ifneq ($(PATH_SDK_DXSDK),)
    … …  
    5151 else
    5252  $(warning kBuild: PATH_SDK_DXSDK couldn't be determined!)
    53   PATH_SDK_DXSDK := $(PATH_DEVTOOLS_TRG)/dxsdk/not/found
     53  PATH_SDK_DXSDK := $(KBUILD_DEVTOOLS_TRG)/dxsdk/not/found
    5454 endif
    5555else

  • trunk/kBuild/sdks/DXSDKAMD64.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_DXSDKAMD64
    38  PATH_SDK_DXSDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/dxsdk/2*)
     38 PATH_SDK_DXSDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/dxsdk/2*)
    3939 ifeq ($(PATH_SDK_DXSDKAMD64),)
    4040  PATH_SDK_DXSDKAMD64 := $(PATH_SDK_DXSDK)
    4141 endif
    4242 ifeq ($(PATH_SDK_DXSDKAMD64),)
    43   PATH_SDK_DXSDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*)
     43  PATH_SDK_DXSDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/dxsdk/2*)
    4444 endif
    4545 ifneq ($(PATH_SDK_DXSDKAMD64),)
    … …  
    4747 else
    4848  $(warning kBuild: PATH_SDK_DXSDKAMD64 couldn't be determined!)
    49   PATH_SDK_DXSDKAMD64 := $(PATH_DEVTOOLS)/win.amd64/dxsdk/not/found
     49  PATH_SDK_DXSDKAMD64 := $(KBUILD_DEVTOOLS)/win.amd64/dxsdk/not/found
    5050 endif
    5151else

  • trunk/kBuild/sdks/DXSDKX86.kmk

    r3121 r3418  
    3737# SDK Specific Properties
    3838ifndef PATH_SDK_DXSDKX86
    39  PATH_SDK_DXSDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*)
     39 PATH_SDK_DXSDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/dxsdk/2*)
    4040 ifeq ($(PATH_SDK_DXSDKX86),)
    4141  PATH_SDK_DXSDKX86 := $(PATH_SDK_DXSDK)
    4242 endif
    4343 ifeq ($(PATH_SDK_DXSDKX86),)
    44   PATH_SDK_DXSDKX86 := $(wildcard $(PATH_DEVTOOLS)/amd64.win/dxsdk/2*)
     44  PATH_SDK_DXSDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/amd64.win/dxsdk/2*)
    4545 endif
    4646 ifneq ($(PATH_SDK_DXSDKX86),)
    … …  
    4848 else
    4949  $(warning kBuild: PATH_SDK_DXSDKX86 couldn't be determined!)
    50   PATH_SDK_DXSDKX86 := $(PATH_DEVTOOLS)/win.x86/dxsdk/not/found
     50  PATH_SDK_DXSDKX86 := $(KBUILD_DEVTOOLS)/win.x86/dxsdk/not/found
    5151 endif
    5252else

  • trunk/kBuild/sdks/LIBSDL.kmk

    r3121 r3418  
    3737_SDK_LIBSDK_IS_FRAMEWORK := no
    3838ifndef PATH_SDK_LIBSDL
    39  PATH_SDK_LIBSDL := $(wildcard $(PATH_DEVTOOLS_TRG)/libsdl/v*)
     39 PATH_SDK_LIBSDL := $(wildcard $(KBUILD_DEVTOOLS_TRG)/libsdl/v*)
    4040 ifeq ($(PATH_SDK_LIBSDL),)
    41   PATH_SDK_LIBSDL := $(wildcard $(PATH_DEVTOOLS_BLD)/libsdl/v*)
     41  PATH_SDK_LIBSDL := $(wildcard $(KBUILD_DEVTOOLS_BLD)/libsdl/v*)
    4242 endif
    4343 ifneq ($(PATH_SDK_LIBSDL),)
    … …  
    6666   else
    6767    $(warning kBuild: PATH_SDK_LIBSDL couldn't be determined!)
    68     PATH_SDK_LIBSDL := $(PATH_DEVTOOLS_TRG)/libsdl/not/found
     68    PATH_SDK_LIBSDL := $(KBUILD_DEVTOOLS_TRG)/libsdl/not/found
    6969   endif
    7070  endif

  • trunk/kBuild/sdks/NT4DDK.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_NT4DDK
    38  PATH_SDK_NT4DDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddknt4/1* $(PATH_DEVTOOLS)/win.x86/ddknt4/2*)
     38 PATH_SDK_NT4DDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddknt4/1* $(KBUILD_DEVTOOLS)/win.x86/ddknt4/2*)
    3939 ifeq ($(PATH_SDK_NT4DDK),)
    40   PATH_SDK_NT4DDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddknt4)
     40  PATH_SDK_NT4DDK := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddknt4)
    4141 endif
    4242 ifneq ($(PATH_SDK_NT4DDK),)
    … …  
    4444 else
    4545  $(warning kBuild: PATH_SDK_NT4DDK couldn't be determined!)
    46   PATH_SDK_NT4DDK := $(PATH_DEVTOOLS)/x86.win/ddknt4/not/found
     46  PATH_SDK_NT4DDK := $(KBUILD_DEVTOOLS)/x86.win/ddknt4/not/found
    4747 endif
    4848else

  • trunk/kBuild/sdks/OS2DDKBASE32.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_OS2DDKBASE32
    38  PATH_SDK_OS2DDKBASE32 := $(wildcard $(PATH_DEVTOOLS)/os2.x86/ddk/2*/base32)
     38 PATH_SDK_OS2DDKBASE32 := $(wildcard $(KBUILD_DEVTOOLS)/os2.x86/ddk/2*/base32)
    3939 ifeq ($(PATH_SDK_OS2DDKBASE32),)
    4040  PATH_SDK_OS2DDKBASE32 := $(wildcard $(PATH_DDKBASE)/../base32)
    … …  
    4444 else
    4545  $(warning kBuild: PATH_SDK_OS2DDKBASE32 couldn't be determined!)
    46   PATH_SDK_OS2DDKBASE32 := $(PATH_DEVTOOLS)/x86.win/ddknt4/not/found
     46  PATH_SDK_OS2DDKBASE32 := $(KBUILD_DEVTOOLS)/x86.win/ddknt4/not/found
    4747 endif
    4848else

  • trunk/kBuild/sdks/W2K3DDK.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_W2K3DDK
    38  PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS_TRG)/ddkwin2k3/2*)
     38 PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS_TRG)/ddkwin2k3/2*)
    3939 ifeq ($(PATH_SDK_W2K3DDK),)
    40   PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS_BLD)/ddkwin2k3/2*)
     40  PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS_BLD)/ddkwin2k3/2*)
    4141 endif
    4242 ifeq ($(PATH_SDK_W2K3DDK),)
    43   PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*)
     43  PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddkwin2k3/2*)
    4444 endif
    4545 ifeq ($(PATH_SDK_W2K3DDK),)
    46   PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
     46  PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
    4747 endif
    4848 ifeq ($(PATH_SDK_W2K3DDK),)
    49   PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
     49  PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
    5050 endif
    5151 ifeq ($(PATH_SDK_W2K3DDK),)
    52   ifneq ($(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/lib/wnet/i386/*.lib),)
    53    PATH_SDK_W2K3DDK := $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3
     52  ifneq ($(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3/lib/wnet/i386/*.lib),)
     53   PATH_SDK_W2K3DDK := $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3
    5454  endif
    5555 endif
    … …  
    5858 else
    5959  $(warning kBuild: PATH_SDK_W2K3DDK couldn't be determined!)
    60   PATH_SDK_W2K3DDK := $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/not/found
     60  PATH_SDK_W2K3DDK := $(KBUILD_DEVTOOLS)/win.x86/ddkwin2k3/not/found
    6161 endif
    6262else

  • trunk/kBuild/sdks/W2K3DDKAMD64.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_W2K3DDKAMD64
    38  PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
     38 PATH_SDK_W2K3DDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
    3939 ifeq ($(PATH_SDK_W2K3DDKAMD64),)
    4040  PATH_SDK_W2K3DDKAMD64 := $(PATH_SDK_W2K3DDK)
    4141 endif
    4242 ifeq ($(PATH_SDK_W2K3DDKAMD64),)
    43   PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*)
     43  PATH_SDK_W2K3DDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddkwin2k3/2*)
    4444 endif
    4545 # legacy:
    4646 ifeq ($(PATH_SDK_W2K3DDKAMD64),)
    47   PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
     47  PATH_SDK_W2K3DDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
    4848 endif
    4949 ifneq ($(PATH_SDK_W2K3DDKAMD64),)
    … …  
    5151 else
    5252  $(warning kBuild: PATH_SDK_W2K3DDKAMD64 couldn't be determined!)
    53   PATH_SDK_W2K3DDKAMD64 := $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/not/found
     53  PATH_SDK_W2K3DDKAMD64 := $(KBUILD_DEVTOOLS)/win.amd64/ddkwin2k3/not/found
    5454 endif
    5555else

  • trunk/kBuild/sdks/W2K3DDKX86.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_W2K3DDKX86
    38  PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*)
     38 PATH_SDK_W2K3DDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddkwin2k3/2*)
    3939 ifeq ($(PATH_SDK_W2K3DDKX86),)
    4040  PATH_SDK_W2K3DDKX86 := $(PATH_SDK_W2K3DDK)
    4141 endif
    4242 ifeq ($(PATH_SDK_W2K3DDKX86),)
    43   PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
     43  PATH_SDK_W2K3DDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
    4444 endif
    4545 # legacy:
    4646 ifeq ($(PATH_SDK_W2K3DDKX86),)
    47   PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
     47  PATH_SDK_W2K3DDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
    4848 endif
    4949 ifeq ($(PATH_SDK_W2K3DDKX86),)
    50   PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3)
     50  PATH_SDK_W2K3DDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3)
    5151 endif
    5252 ifneq ($(PATH_SDK_W2K3DDKX86),)
    … …  
    5454 else
    5555  $(warning kBuild: PATH_SDK_W2K3DDKX86 couldn't be determined!)
    56   PATH_SDK_W2K3DDKX86 := $(PATH_DEVTOOLS)/x86.win/ddkwin2k3/not/found
     56  PATH_SDK_W2K3DDKX86 := $(KBUILD_DEVTOOLS)/x86.win/ddkwin2k3/not/found
    5757 endif
    5858else

  • trunk/kBuild/sdks/W32API.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_W32API
    38  PATH_SDK_W32API := $(wildcard $(PATH_DEVTOOLS)/win.x86/w32api/v*)
     38 PATH_SDK_W32API := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/w32api/v*)
    3939 ifeq ($(PATH_SDK_W32API),)
    40   PATH_SDK_W32API := $(wildcard $(PATH_DEVTOOLS)/x86.win32/w32api/v*)
     40  PATH_SDK_W32API := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/w32api/v*)
    4141 endif
    4242 ifneq ($(PATH_SDK_W32API),)
    … …  
    4444 else
    4545  $(warning kBuild: PATH_SDK_W32API couldn't be determined!)
    46   PATH_SDK_W32API := $(PATH_DEVTOOLS)/x86.win/w32api/not/found
     46  PATH_SDK_W32API := $(KBUILD_DEVTOOLS)/x86.win/w32api/not/found
    4747 endif
    4848else

  • trunk/kBuild/sdks/WIN32SDK.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_WIN32SDK
    38  PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
     38 PATH_SDK_WIN32SDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2*)
    3939 ifeq ($(PATH_SDK_WIN32SDK),)
    4040  PATH_SDK_WIN32SDK := $(PATH_SDK_WINPSDK)
    4141 endif
    4242 ifeq ($(PATH_SDK_WIN32SDK),)
    43   PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*)
     43  PATH_SDK_WIN32SDK := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/sdk/2*)
    4444 endif
    4545 ifeq ($(PATH_SDK_WIN32SDK),)
    46   PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
     46  PATH_SDK_WIN32SDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/2*)
    4747 endif
    4848 ifneq ($(PATH_SDK_WIN32SDK),)
    … …  
    5050 else
    5151  $(warning kBuild: PATH_SDK_WIN32SDK couldn't be determined!)
    52   PATH_SDK_WIN32SDK := $(PATH_DEVTOOLS)/win.x86/sdk/not/found
     52  PATH_SDK_WIN32SDK := $(KBUILD_DEVTOOLS)/win.x86/sdk/not/found
    5353 endif
    5454endif

  • trunk/kBuild/sdks/WIN32SDK2002.kmk

    r3121 r3418  
    3939# SDK Specific Properties
    4040ifndef PATH_SDK_WIN32SDK2002
    41  PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2002*)
     41 PATH_SDK_WIN32SDK2002 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2002*)
    4242 ifeq ($(PATH_SDK_WIN32SDK2002),)
    43   PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2002*)
     43  PATH_SDK_WIN32SDK2002 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/sdk/2002*)
    4444 endif
    4545 ifeq ($(PATH_SDK_WIN32SDK2002),)
    46   PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk2002*)
     46  PATH_SDK_WIN32SDK2002 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/sdk2002*)
    4747 endif
    4848 ifneq ($(PATH_SDK_WIN32SDK2002),)
    … …  
    5050 else
    5151  $(warning kBuild: PATH_SDK_WIN32SDK2002 couldn't be determined!)
    52   PATH_SDK_WIN32SDK2002 := $(PATH_DEVTOOLS)/win.x86/sdk/2002/not/found
     52  PATH_SDK_WIN32SDK2002 := $(KBUILD_DEVTOOLS)/win.x86/sdk/2002/not/found
    5353 endif
    5454else

  • trunk/kBuild/sdks/WIN64SDK.kmk

    r3121 r3418  
    3737# SDK Specific Properties
    3838ifndef PATH_SDK_WIN64SDK
    39  PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
     39 PATH_SDK_WIN64SDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/2*)
    4040 ifeq ($(PATH_SDK_WIN64SDK),)
    4141  PATH_SDK_WIN64SDK := $(PATH_SDK_WINPSDK)
    4242 endif
    4343 ifeq ($(PATH_SDK_WIN64SDK),)
    44   PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
     44  PATH_SDK_WIN64SDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2*)
    4545 endif
    4646 ifneq ($(PATH_SDK_WIN64SDK),)
    … …  
    4848 else
    4949  $(warning kBuild: PATH_SDK_WIN64SDK couldn't be determined!)
    50   PATH_SDK_WIN64SDK := $(PATH_DEVTOOLS)/win.amd64/sdk/not/found
     50  PATH_SDK_WIN64SDK := $(KBUILD_DEVTOOLS)/win.amd64/sdk/not/found
    5151 endif
    5252else

  • trunk/kBuild/sdks/WINDDK.kmk

    r3121 r3418  
    3838# SDK Specific Properties
    3939ifndef PATH_SDK_WINDDK
    40  PATH_SDK_WINDDK := $(wildcard $(PATH_DEVTOOLS_TRG)/ddk/6*)
     40 PATH_SDK_WINDDK := $(wildcard $(KBUILD_DEVTOOLS_TRG)/ddk/6*)
    4141 ifeq ($(PATH_SDK_WINDDK),)
    42   PATH_SDK_WINDDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddk/6*)
     42  PATH_SDK_WINDDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddk/6*)
    4343 endif
    4444 ifeq ($(PATH_SDK_WINDDK),)
    45   PATH_SDK_WINDDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddk/6*)
     45  PATH_SDK_WINDDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddk/6*)
    4646 endif
    4747 ifeq ($(PATH_SDK_WINDDK),)
    … …  
    5454 else
    5555  $(warning kBuild: PATH_SDK_WINDDK couldn't be determined!)
    56   PATH_SDK_WINDDK := $(PATH_DEVTOOLS)/win.x86/ddk/not/found
     56  PATH_SDK_WINDDK := $(KBUILD_DEVTOOLS)/win.x86/ddk/not/found
    5757 endif
    5858else

  • trunk/kBuild/sdks/WINDDK71.kmk

    r3121 r3418  
    3838# SDK Specific Properties
    3939ifndef PATH_SDK_WINDDK71
    40  PATH_SDK_WINDDK71 := $(wildcard $(PATH_DEVTOOLS_TRG)/ddk/7600.16385.1*)
     40 PATH_SDK_WINDDK71 := $(wildcard $(KBUILD_DEVTOOLS_TRG)/ddk/7600.16385.1*)
    4141 ifeq ($(PATH_SDK_WINDDK71),)
    42   PATH_SDK_WINDDK71 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddk/7600.16385.1*)
     42  PATH_SDK_WINDDK71 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddk/7600.16385.1*)
    4343 endif
    4444 ifeq ($(PATH_SDK_WINDDK71),)
    45   PATH_SDK_WINDDK71 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddk/7600.16385.1*)
     45  PATH_SDK_WINDDK71 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddk/7600.16385.1*)
    4646 endif
    4747 ifeq ($(PATH_SDK_WINDDK71),)
    … …  
    5454 else
    5555  $(warning kBuild: PATH_SDK_WINDDK71 couldn't be determined!)
    56   PATH_SDK_WINDDK71 := $(PATH_DEVTOOLS)/win.x86/ddk/7600.16385.1-not-found
     56  PATH_SDK_WINDDK71 := $(KBUILD_DEVTOOLS)/win.x86/ddk/7600.16385.1-not-found
    5757 endif
    5858else

  • trunk/kBuild/sdks/WINDDK80.kmk

    r3121 r3418  
    3838# SDK Specific Properties
    3939ifndef PATH_SDK_WINDDK80
    40  PATH_SDK_WINDDK80 := $(wildcard $(PATH_DEVTOOLS_TRG)/ddk/v8*)
     40 PATH_SDK_WINDDK80 := $(wildcard $(KBUILD_DEVTOOLS_TRG)/ddk/v8*)
    4141 ifeq ($(PATH_SDK_WINDDK80),)
    42   PATH_SDK_WINDDK80 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddk/v8*)
     42  PATH_SDK_WINDDK80 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddk/v8*)
    4343 endif
    4444 ifeq ($(PATH_SDK_WINDDK80),)
    45   PATH_SDK_WINDDK80 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddk/v8*)
     45  PATH_SDK_WINDDK80 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddk/v8*)
    4646 endif
    4747 ifneq ($(PATH_SDK_WINDDK80),)
    … …  
    4949 else
    5050  $(warning kBuild: PATH_SDK_WINDDK80 couldn't be determined!)
    51   PATH_SDK_WINDDK80 := $(PATH_DEVTOOLS)/win.x86/ddk/v8.0/not/found
     51  PATH_SDK_WINDDK80 := $(KBUILD_DEVTOOLS)/win.x86/ddk/v8.0/not/found
    5252 endif
    5353else

  • trunk/kBuild/sdks/WINPSDK.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_WINPSDK
    38  PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*)
     38 PATH_SDK_WINPSDK := $(wildcard $(KBUILD_DEVTOOLS_BLD)/sdk/2*)
    3939 ifeq ($(PATH_SDK_WINPSDK),)
    40   PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*)
     40  PATH_SDK_WINPSDK := $(wildcard $(KBUILD_DEVTOOLS_TRG)/sdk/2*)
    4141 endif
    4242 ifeq ($(PATH_SDK_WINPSDK),)
    43   PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
     43  PATH_SDK_WINPSDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2*)
    4444 endif
    4545 ifeq ($(PATH_SDK_WINPSDK),)
    46   PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
     46  PATH_SDK_WINPSDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/2*)
    4747 endif
    4848 ifneq ($(PATH_SDK_WINPSDK),)
    … …  
    5050 else
    5151  $(warning kBuild: PATH_SDK_WINPSDK couldn't be determined!)
    52   PATH_SDK_WINPSDK := $(PATH_DEVTOOLS_BLD)/sdk/not/found
     52  PATH_SDK_WINPSDK := $(KBUILD_DEVTOOLS_BLD)/sdk/not/found
    5353 endif
    5454else

  • trunk/kBuild/sdks/WINPSDK71.kmk

    r3121 r3418  
    3636# SDK Specific Properties
    3737ifndef PATH_SDK_WINPSDK71
    38  PATH_SDK_WINPSDK71 := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/v7.1*)
     38 PATH_SDK_WINPSDK71 := $(wildcard $(KBUILD_DEVTOOLS_BLD)/sdk/v7.1*)
    3939 ifeq ($(PATH_SDK_WINPSDK71),)
    40   PATH_SDK_WINPSDK71 := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/v7.1*)
     40  PATH_SDK_WINPSDK71 := $(wildcard $(KBUILD_DEVTOOLS_TRG)/sdk/v7.1*)
    4141 endif
    4242 ifeq ($(PATH_SDK_WINPSDK71),)
    43   PATH_SDK_WINPSDK71 := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/v7.1*)
     43  PATH_SDK_WINPSDK71 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1*)
    4444 endif
    4545 ifeq ($(PATH_SDK_WINPSDK71),)
    46   PATH_SDK_WINPSDK71 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/v7.1*)
     46  PATH_SDK_WINPSDK71 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/v7.1*)
    4747 endif
    4848 ifneq ($(PATH_SDK_WINPSDK71),)
    … …  
    5050 else
    5151  $(warning kBuild: PATH_SDK_WINPSDK71 couldn't be determined!)
    52   PATH_SDK_WINPSDK71 := $(PATH_DEVTOOLS_BLD)/sdk/v7.1-not-found
     52  PATH_SDK_WINPSDK71 := $(KBUILD_DEVTOOLS_BLD)/sdk/v7.1-not-found
    5353 endif
    5454else

  • trunk/kBuild/sdks/WINPSDK71INCS.kmk

    r3121 r3418  
    4343  PATH_SDK_WINPSDK71INCS := $(PATH_SDK_WINPSDK71)
    4444 else
    45   PATH_SDK_WINPSDK71INCS := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/v7.1*)
     45  PATH_SDK_WINPSDK71INCS := $(wildcard $(KBUILD_DEVTOOLS_BLD)/sdk/v7.1*)
    4646  ifeq ($(PATH_SDK_WINPSDK71INCS),)
    47    PATH_SDK_WINPSDK71INCS := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/v7.1*)
     47   PATH_SDK_WINPSDK71INCS := $(wildcard $(KBUILD_DEVTOOLS_TRG)/sdk/v7.1*)
    4848  endif
    4949  ifeq ($(PATH_SDK_WINPSDK71INCS),)
    50    PATH_SDK_WINPSDK71INCS := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/v7.1*)
     50   PATH_SDK_WINPSDK71INCS := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1*)
    5151  endif
    5252  ifeq ($(PATH_SDK_WINPSDK71INCS),)
    53    PATH_SDK_WINPSDK71INCS := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/v7.1*)
     53   PATH_SDK_WINPSDK71INCS := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/v7.1*)
    5454  endif
    5555  ifneq ($(PATH_SDK_WINPSDK71INCS),)
    … …  
    5757  else
    5858   $(warning kBuild: PATH_SDK_WINPSDK71INCS couldn't be determined!)
    59    PATH_SDK_WINPSDK71INCS := $(PATH_DEVTOOLS_BLD)/sdk/v7.1-not-found
     59   PATH_SDK_WINPSDK71INCS := $(KBUILD_DEVTOOLS_BLD)/sdk/v7.1-not-found
    6060  endif
    6161 endif

  • trunk/kBuild/sdks/WINPSDKINCS.kmk

    r3121 r3418  
    4343  PATH_SDK_WINPSDKINCS := $(PATH_SDK_WINPSDK)
    4444 else
    45   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*)
     45  PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS_BLD)/sdk/2*)
    4646  ifeq ($(PATH_SDK_WINPSDKINCS),)
    47    PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*)
     47   PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS_TRG)/sdk/2*)
    4848  endif
    4949  ifeq ($(PATH_SDK_WINPSDKINCS),)
    50    PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
     50   PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2*)
    5151  endif
    5252  ifeq ($(PATH_SDK_WINPSDKINCS),)
    53    PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*)
     53   PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/sdk/2*)
    5454  endif
    5555  ifeq ($(PATH_SDK_WINPSDKINCS),)
    56    PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
     56   PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/2*)
    5757  endif
    5858  ifneq ($(PATH_SDK_WINPSDKINCS),)
    … …  
    6060  else
    6161   $(warning kBuild: PATH_SDK_WINPSDKINCS couldn't be determined!)
    62    PATH_SDK_WINPSDKINCS := $(PATH_DEVTOOLS_BLD)/sdk/not/found
     62   PATH_SDK_WINPSDKINCS := $(KBUILD_DEVTOOLS_BLD)/sdk/not/found
    6363  endif
    6464 endif

  • trunk/kBuild/sdks/WINSDK10.kmk

    r3320 r3418  
    4949 ifndef SDK_WINSDK10_VERSION
    5050  PATH_SDK_WINSDK10 := $(firstfile $(foreachfile toolsdir, \
    51         $(PATH_DEVTOOLS_BLD) $(PATH_DEVTOOLS_TRG) $(PATH_DEVTOOLS)/win.x86 $(PATH_DEVTOOLS)/win.amd64 \
     51        $(KBUILD_DEVTOOLS_BLD) $(KBUILD_DEVTOOLS_TRG) $(KBUILD_DEVTOOLS)/win.x86 $(KBUILD_DEVTOOLS)/win.amd64 \
    5252       , $(rsortfiles $(qwildcard ,$(toolsdir)/sdk/v10*/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]/10.0.*))))
    5353  ifeq ($(PATH_SDK_WINSDK10),)
    … …  
    5656   ifeq ($(PATH_SDK_WINSDK10),)
    5757    $(warning kBuild: PATH_SDK_WINSDK10 couldn't be determined!)
    58     PATH_SDK_WINSDK10 := $(PATH_DEVTOOLS_BLD)/sdk/v10-not-found/Include/10.0.10240.0
     58    PATH_SDK_WINSDK10 := $(KBUILD_DEVTOOLS_BLD)/sdk/v10-not-found/Include/10.0.10240.0
    5959   endif
    6060  endif
    … …  
    6262 else
    6363  PATH_SDK_WINSDK10 := $(firstfile $(foreachfile toolsdir, \
    64         $(PATH_DEVTOOLS_BLD) $(PATH_DEVTOOLS_TRG) $(PATH_DEVTOOLS)/win.x86 $(PATH_DEVTOOLS)/win.amd64 \
     64        $(KBUILD_DEVTOOLS_BLD) $(KBUILD_DEVTOOLS_TRG) $(KBUILD_DEVTOOLS)/win.x86 $(KBUILD_DEVTOOLS)/win.amd64 \
    6565       , $(rsortfiles $(qwildcard ,$(toolsdir)/sdk/v10*/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]/$(SDK_WINSDK10_VERSION)))))
    6666  ifeq ($(PATH_SDK_WINSDK10),)
    … …  
    6969   ifeq ($(PATH_SDK_WINSDK10),)
    7070    $(warning kBuild: PATH_SDK_WINSDK10 couldn't be determined!)
    71     PATH_SDK_WINSDK10 := $(PATH_DEVTOOLS_BLD)/sdk/v10-not-found/Include/$(SDK_WINSDK10_VERSION)
     71    PATH_SDK_WINSDK10 := $(KBUILD_DEVTOOLS_BLD)/sdk/v10-not-found/Include/$(SDK_WINSDK10_VERSION)
    7272   endif
    7373  endif

  • trunk/kBuild/units/qt3.kmk

    r3284 r3418  
    6565#       PATH_SDK_QT3_LIB.x86   - the Qt3 library directory for X86.
    6666ifndef PATH_SDK_QT3
    67  PATH_SDK_QT3 := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3*)))
     67 PATH_SDK_QT3 := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v3*)))
    6868 ifeq ($(PATH_SDK_QT3),)
    6969  # If target == host, try look for Qt in the various platform specific places.
    … …  
    190190  ifeq ($(PATH_SDK_QT3),)
    191191   $(warning kBuild: Couldn't find the Qt3 headers and libaries...)
    192    PATH_SDK_QT3 := $(PATH_DEVTOOLS_TRG)/qt/not-found
     192   PATH_SDK_QT3 := $(KBUILD_DEVTOOLS_TRG)/qt/not-found
    193193  endif
    194194 endif
    … …  
    219219#       PATH_TOOL_QT3_BIN - the directory containing moc, uic, lrelease, lupdate and qm2ts.
    220220ifndef PATH_TOOL_QT3_BIN
    221  PATH_TOOL_QT3_BIN := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v3*/bin)))
     221 PATH_TOOL_QT3_BIN := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_BLD)/qt/v3*/bin)))
    222222 ifeq ($(PATH_TOOL_QT3_BIN),)
    223223  if1of ($(KBUILD_HOST), win os2)
Note: See TracChangeset for help on using the changeset viewer.