Changeset 692
- Timestamp:
- Dec 8, 2006, 11:31:16 PM (19 years ago)
- Location:
- trunk/kBuild
- Files:
-
- 21 edited
-
header.kmk (modified) (1 diff)
-
sdks/DXSDK.kmk (modified) (1 diff)
-
sdks/DXSDKAMD64.kmk (modified) (1 diff)
-
sdks/DXSDKX86.kmk (modified) (1 diff)
-
sdks/LIBSDL.kmk (modified) (2 diffs)
-
sdks/NT4DDK.kmk (modified) (1 diff)
-
sdks/W2K3DDK.kmk (modified) (1 diff)
-
sdks/W2K3DDKAMD64.kmk (modified) (2 diffs)
-
sdks/W2K3DDKX86.kmk (modified) (2 diffs)
-
sdks/W32API.kmk (modified) (1 diff)
-
sdks/WIN32SDK.kmk (modified) (1 diff)
-
sdks/WIN32SDK2002.kmk (modified) (1 diff)
-
sdks/WIN64SDK.kmk (modified) (1 diff)
-
sdks/WINPSDK.kmk (modified) (1 diff)
-
sdks/WINPSDKINCS.kmk (modified) (1 diff)
-
tools/MINGW32.kmk (modified) (2 diffs)
-
tools/TAR.kmk (modified) (1 diff)
-
tools/TARGZ.kmk (modified) (1 diff)
-
tools/VCC70.kmk (modified) (1 diff)
-
tools/WGET.kmk (modified) (1 diff)
-
tools/ZIP.kmk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/header.kmk
r673 r692 709 709 endif # __header_kmk__ 710 710 711 -
trunk/kBuild/sdks/DXSDK.kmk
r670 r692 35 35 endif 36 36 ifeq ($(PATH_SDK_DXSDK),) 37 PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/ x86.win/dxsdk/2*))37 PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*)) 38 38 endif 39 39 ifeq ($(PATH_SDK_DXSDK),) 40 PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/dxsdk/2*)) 41 endif 42 ifeq ($(PATH_SDK_DXSDK),) 43 PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/dxsdk/2*)) 40 PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/win.amd64/dxsdk/2*)) 44 41 endif 45 42 ifneq ($(PATH_SDK_DXSDK),) -
trunk/kBuild/sdks/DXSDKAMD64.kmk
r664 r692 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_DXSDKAMD64 31 PATH_SDK_DXSDKAMD64 := $( sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/dxsdk/2*))31 PATH_SDK_DXSDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/dxsdk/2*) 32 32 ifeq ($(PATH_SDK_DXSDKAMD64),) 33 PATH_SDK_DXSDKAMD64 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/dxsdk/2*))33 PATH_SDK_DXSDKAMD64 := $(PATH_SDK_DXSDK) 34 34 endif 35 35 ifeq ($(PATH_SDK_DXSDKAMD64),) 36 PATH_SDK_DXSDKAMD64 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/dxsdk/2*)) # legacy36 PATH_SDK_DXSDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*) 37 37 endif 38 38 ifneq ($(PATH_SDK_DXSDKAMD64),) 39 PATH_SDK_DXSDKAMD64 := $( call lastword,$(PATH_SDK_DXSDKAMD64))39 PATH_SDK_DXSDKAMD64 := $(lastword $(sort $(PATH_SDK_DXSDKAMD64))) 40 40 else 41 41 $(warning kBuild: PATH_SDK_DXSDKAMD64 couldn't be determined!) 42 PATH_SDK_DXSDKAMD64 := $(PATH_DEVTOOLS)/ amd64.win/dxsdk/not/found42 PATH_SDK_DXSDKAMD64 := $(PATH_DEVTOOLS)/win.amd64/dxsdk/not/found 43 43 endif 44 44 else -
trunk/kBuild/sdks/DXSDKX86.kmk
r664 r692 30 30 # SDK Specific Properties 31 31 ifndef PATH_SDK_DXSDKX86 32 PATH_SDK_DXSDKX86 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/dxsdk/2*))32 PATH_SDK_DXSDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*) 33 33 ifeq ($(PATH_SDK_DXSDKX86),) 34 PATH_SDK_DXSDKX86 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/dxsdk/2*))34 PATH_SDK_DXSDKX86 := $(PATH_SDK_DXSDK) 35 35 endif 36 36 ifeq ($(PATH_SDK_DXSDKX86),) 37 PATH_SDK_DXSDKX86 := $( sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/dxsdk/2*))37 PATH_SDK_DXSDKX86 := $(wildcard $(PATH_DEVTOOLS)/amd64.win/dxsdk/2*) 38 38 endif 39 39 ifneq ($(PATH_SDK_DXSDKX86),) 40 PATH_SDK_DXSDKX86 := $( call lastword,$(PATH_SDK_DXSDKX86))40 PATH_SDK_DXSDKX86 := $(lastword $(sort $(PATH_SDK_DXSDKX86))) 41 41 else 42 42 $(warning kBuild: PATH_SDK_DXSDKX86 couldn't be determined!) 43 PATH_SDK_DXSDKX86 := $(PATH_DEVTOOLS)/ x86.win/dxsdk/not/found43 PATH_SDK_DXSDKX86 := $(PATH_DEVTOOLS)/win.x86/dxsdk/not/found 44 44 endif 45 45 else -
trunk/kBuild/sdks/LIBSDL.kmk
r676 r692 2 2 ## @file 3 3 # 4 # kBuild SDK - libsdl, targeting $(BUILD_TARGET).4 # kBuild SDK - Simple DirectMedia Layer, targeting $(BUILD_TARGET). 5 5 # 6 6 # Copyright (c) 2006 knut st. osmundsen <bird-srcspam@anduin.net> … … 25 25 # 26 26 27 SDK_LIBSDL := libsdl, targeting $(BUILD_TARGET).27 SDK_LIBSDL := Simple DirectMedia Layer, targeting $(BUILD_TARGET). 28 28 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_LIBSDL 31 PATH_SDK_LIBSDL := $( sort $(wildcard $(PATH_DEVTOOLS_TRG)/libsdl/v*))31 PATH_SDK_LIBSDL := $(wildcard $(PATH_DEVTOOLS_TRG)/libsdl/v*) 32 32 ifeq ($(PATH_SDK_LIBSDL),) 33 PATH_SDK_LIBSDL := $( sort $(wildcard $(PATH_DEVTOOLS_BLD)/libsdl/v*))33 PATH_SDK_LIBSDL := $(wildcard $(PATH_DEVTOOLS_BLD)/libsdl/v*) 34 34 endif 35 35 ifneq ($(PATH_SDK_LIBSDL),) 36 PATH_SDK_LIBSDL := $( call lastword,$(PATH_SDK_LIBSDL))36 PATH_SDK_LIBSDL := $(lastword $(sort $(PATH_SDK_LIBSDL))) 37 37 else 38 $(warning kBuild: PATH_SDK_LIBSDL couldn't be determined!) 39 PATH_SDK_LIBSDL := /usr 38 # Search in the typical unix places. 39 PATH_SDK_LIBSDL := $(firstword $(wildcard \ 40 /lib/libsdl.* \ 41 /usr/lib/libsdl.* \ 42 /usr/local/lib/libsdl.* \ 43 /opt/lib/libsdl.* \ 44 /opt/local/lib/libsdl.*) ) 45 ifneq ($(PATH_SDK_LIBSDL),) 46 PATH_SDK_LIBSDL := $(patsubst %/,%,$(dir $(dir PATH_SDK_LIBSDL))) 47 else 48 $(warning kBuild: PATH_SDK_LIBSDL couldn't be determined!) 49 PATH_SDK_LIBSDL := $(PATH_DEVTOOLS_TRG)/libsdl/not/found 50 endif 40 51 endif 41 52 else -
trunk/kBuild/sdks/NT4DDK.kmk
r664 r692 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_NT4DDK 31 PATH_SDK_NT4DDK := $(wildcard $(PATH_DEVTOOLS)/ x86.win/ddknt4)31 PATH_SDK_NT4DDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddknt4/1* $(PATH_DEVTOOLS)/win.x86/ddknt4/2*) 32 32 ifeq ($(PATH_SDK_NT4DDK),) 33 PATH_SDK_NT4DDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddknt4) # legacy33 PATH_SDK_NT4DDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddknt4) 34 34 endif 35 35 ifneq ($(PATH_SDK_NT4DDK),) 36 # only one version here, currently.36 PATH_SDK_NT4DDK := $(lastword $(sort $(PATH_SDK_NT4DDK))) 37 37 else 38 38 $(warning kBuild: PATH_SDK_NT4DDK couldn't be determined!) -
trunk/kBuild/sdks/W2K3DDK.kmk
r664 r692 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_W2K3DDK 31 PATH_SDK_W2K3DDK := $( sort $(wildcard $(PATH_DEVTOOLS_TRG)/ddkwin2k3/2*))31 PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS_TRG)/ddkwin2k3/2*) 32 32 ifeq ($(PATH_SDK_W2K3DDK),) 33 PATH_SDK_W2K3DDK := $( sort $(wildcard $(PATH_DEVTOOLS_BLD)/ddkwin2k3/2*))33 PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS_BLD)/ddkwin2k3/2*) 34 34 endif 35 35 ifeq ($(PATH_SDK_W2K3DDK),) 36 PATH_SDK_W2K3DDK := $( sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/ddkwin2k3/2*))36 PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*) 37 37 endif 38 38 ifeq ($(PATH_SDK_W2K3DDK),) 39 PATH_SDK_W2K3DDK := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/ddkwin2k3/2*))39 PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*) 40 40 endif 41 41 ifeq ($(PATH_SDK_W2K3DDK),) 42 PATH_SDK_W2K3DDK := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)) 42 PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*) 43 endif 44 ifeq ($(PATH_SDK_W2K3DDK),) 45 ifneq ($(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/lib/wnet/i386/*.lib),) 46 PATH_SDK_W2K3DDK := $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3 47 endif 43 48 endif 44 49 ifneq ($(PATH_SDK_W2K3DDK),) 45 PATH_SDK_W2K3DDK := $( call lastword,$(PATH_SDK_W2K3DDK))50 PATH_SDK_W2K3DDK := $(lastword $(sort $(PATH_SDK_W2K3DDK))) 46 51 else 47 52 $(warning kBuild: PATH_SDK_W2K3DDK couldn't be determined!) 48 PATH_SDK_W2K3DDK := $(PATH_DEVTOOLS)/ x86.win32/ddkwin2k353 PATH_SDK_W2K3DDK := $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/not/found 49 54 endif 50 55 else -
trunk/kBuild/sdks/W2K3DDKAMD64.kmk
r664 r692 2 2 ## @file 3 3 # 4 # kBuild SDK - The Microsoft Windows 2003 DDK, targeting AMD64.4 # kBuild SDK - The Microsoft Windows 2003 DDK, targeting amd64. 5 5 # 6 6 # Copyright (c) 2006 knut st. osmundsen <bird-srcspam@anduin.net> … … 25 25 # 26 26 27 SDK_W2K3DDKAMD64 := The Microsoft Windows 2003 DDK, targeting AMD64.27 SDK_W2K3DDKAMD64 := The Microsoft Windows 2003 DDK, targeting amd64. 28 28 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_W2K3DDKAMD64 31 PATH_SDK_W2K3DDKAMD64 := $( sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/ddkwin2k3/2*))31 PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*) 32 32 ifeq ($(PATH_SDK_W2K3DDKAMD64),) 33 PATH_SDK_W2K3DDKAMD64 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/ddkwin2k3/2*))33 PATH_SDK_W2K3DDKAMD64 := $(PATH_SDK_W2K3DDK) 34 34 endif 35 35 ifeq ($(PATH_SDK_W2K3DDKAMD64),) 36 PATH_SDK_W2K3DDKAMD64 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)) 36 PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*) 37 endif 38 # legacy: 39 ifeq ($(PATH_SDK_W2K3DDKAMD64),) 40 PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*) 37 41 endif 38 42 ifneq ($(PATH_SDK_W2K3DDKAMD64),) 39 PATH_SDK_W2K3DDKAMD64 := $( call lastword,$(PATH_SDK_W2K3DDKAMD64))43 PATH_SDK_W2K3DDKAMD64 := $(lastword $(sort $(PATH_SDK_W2K3DDKAMD64))) 40 44 else 41 45 $(warning kBuild: PATH_SDK_W2K3DDKAMD64 couldn't be determined!) 42 PATH_SDK_W2K3DDKAMD64 := $(PATH_DEVTOOLS)/ x86.win32/ddkwin2k346 PATH_SDK_W2K3DDKAMD64 := $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/not/found 43 47 endif 44 48 else -
trunk/kBuild/sdks/W2K3DDKX86.kmk
r675 r692 2 2 ## @file 3 3 # 4 # kBuild SDK - The Microsoft Windows 2003 DDK, targeting X86.4 # kBuild SDK - The Microsoft Windows 2003 DDK, targeting x86. 5 5 # 6 6 # Copyright (c) 2006 knut st. osmundsen <bird-srcspam@anduin.net> … … 25 25 # 26 26 27 SDK_W2K3DDKX86 := The Microsoft Windows 2003 DDK, targeting X86.27 SDK_W2K3DDKX86 := The Microsoft Windows 2003 DDK, targeting x86. 28 28 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_W2K3DDKX86 31 PATH_SDK_W2K3DDKX86 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/ddkwin2k3/2*))31 PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*) 32 32 ifeq ($(PATH_SDK_W2K3DDKX86),) 33 PATH_SDK_W2K3DDKX86 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*))33 PATH_SDK_W2K3DDKX86 := $(PATH_SDK_W2K3DDK) 34 34 endif 35 35 ifeq ($(PATH_SDK_W2K3DDKX86),) 36 PATH_SDK_W2K3DDKX86 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3)) 36 PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*) 37 endif 38 # legacy: 39 ifeq ($(PATH_SDK_W2K3DDKX86),) 40 PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*) 37 41 endif 38 42 ifeq ($(PATH_SDK_W2K3DDKX86),) 39 PATH_SDK_W2K3DDKX86 := $( sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/ddkwin2k3/2*))43 PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3) 40 44 endif 41 45 ifneq ($(PATH_SDK_W2K3DDKX86),) 42 PATH_SDK_W2K3DDKX86 := $( call lastword,$(PATH_SDK_W2K3DDKX86))46 PATH_SDK_W2K3DDKX86 := $(lastword $(sort $(PATH_SDK_W2K3DDKX86))) 43 47 else 44 48 $(warning kBuild: PATH_SDK_W2K3DDKX86 couldn't be determined!) -
trunk/kBuild/sdks/W32API.kmk
r664 r692 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_W32API 31 PATH_SDK_W32API := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/w32api/v*))31 PATH_SDK_W32API := $(wildcard $(PATH_DEVTOOLS)/win.x86/w32api/v*) 32 32 ifeq ($(PATH_SDK_W32API),) 33 PATH_SDK_W32API := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/w32api/v*))33 PATH_SDK_W32API := $(wildcard $(PATH_DEVTOOLS)/x86.win32/w32api/v*) 34 34 endif 35 35 ifneq ($(PATH_SDK_W32API),) 36 PATH_SDK_W32API := $( call lastword,$(PATH_SDK_W32API))36 PATH_SDK_W32API := $(lastword $(sort $(PATH_SDK_W32API))) 37 37 else 38 38 $(warning kBuild: PATH_SDK_W32API couldn't be determined!) -
trunk/kBuild/sdks/WIN32SDK.kmk
r664 r692 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_WIN32SDK 31 PATH_SDK_WIN32SDK := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2*))31 PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*) 32 32 ifeq ($(PATH_SDK_WIN32SDK),) 33 PATH_SDK_WIN32SDK := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*))33 PATH_SDK_WIN32SDK := $(PATH_SDK_WINPSDK) 34 34 endif 35 35 ifeq ($(PATH_SDK_WIN32SDK),) 36 PATH_SDK_WIN32SDK := $(sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/sdk/2*)) 36 PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*) 37 endif 38 ifeq ($(PATH_SDK_WIN32SDK),) 39 PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*) 37 40 endif 38 41 ifneq ($(PATH_SDK_WIN32SDK),) 39 PATH_SDK_WIN32SDK := $( call lastword,$(PATH_SDK_WIN32SDK))42 PATH_SDK_WIN32SDK := $(lastword $(sort $(PATH_SDK_WIN32SDK))) 40 43 else 41 44 $(warning kBuild: PATH_SDK_WIN32SDK couldn't be determined!) 42 PATH_SDK_WIN32SDK := $(PATH_DEVTOOLS)/ x86.win32/sdk/not/found45 PATH_SDK_WIN32SDK := $(PATH_DEVTOOLS)/win.x86/sdk/not/found 43 46 endif 44 47 endif -
trunk/kBuild/sdks/WIN32SDK2002.kmk
r664 r692 32 32 # SDK Specific Properties 33 33 ifndef PATH_SDK_WIN32SDK2002 34 PATH_SDK_WIN32SDK2002 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2002*))34 PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2002*) 35 35 ifeq ($(PATH_SDK_WIN32SDK2002),) 36 PATH_SDK_WIN32SDK2002 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2002*))36 PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2002*) 37 37 endif 38 38 ifeq ($(PATH_SDK_WIN32SDK2002),) 39 PATH_SDK_WIN32SDK2002 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk2002*)) 40 endif 41 ifeq ($(PATH_SDK_WIN32SDK2002),) 42 PATH_SDK_WIN32SDK2002 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk2002*)) 39 PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk2002*) 43 40 endif 44 41 ifneq ($(PATH_SDK_WIN32SDK2002),) 45 PATH_SDK_WIN32SDK2002 := $( call lastword,$(PATH_SDK_WIN32SDK2002))42 PATH_SDK_WIN32SDK2002 := $(lastword $(sort $(PATH_SDK_WIN32SDK2002))) 46 43 else 47 44 $(warning kBuild: PATH_SDK_WIN32SDK2002 couldn't be determined!) 48 PATH_SDK_WIN32SDK2002 := $(PATH_DEVTOOLS)/ x86.win/sdk/not/found45 PATH_SDK_WIN32SDK2002 := $(PATH_DEVTOOLS)/win.x86/sdk/2002/not/found 49 46 endif 50 47 else -
trunk/kBuild/sdks/WIN64SDK.kmk
r664 r692 30 30 # SDK Specific Properties 31 31 ifndef PATH_SDK_WIN64SDK 32 PATH_SDK_WIN64SDK := $( sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/sdk/2*))32 PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*) 33 33 ifeq ($(PATH_SDK_WIN64SDK),) 34 PATH_SDK_WIN64SDK := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2*))34 PATH_SDK_WIN64SDK := $(PATH_SDK_WINPSDK) 35 35 endif 36 36 ifeq ($(PATH_SDK_WIN64SDK),) 37 PATH_SDK_WIN64SDK := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*)) 37 PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2*) 38 endif 39 ifeq ($(PATH_SDK_WIN64SDK),) 40 PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*) 38 41 endif 39 42 ifneq ($(PATH_SDK_WIN64SDK),) 40 PATH_SDK_WIN64SDK := $( call lastword,$(PATH_SDK_WIN64SDK))43 PATH_SDK_WIN64SDK := $(lastword $(sort $(PATH_SDK_WIN64SDK))) 41 44 else 42 45 $(warning kBuild: PATH_SDK_WIN64SDK couldn't be determined!) 43 PATH_SDK_WIN64SDK := $(PATH_DEVTOOLS)/ amd64.win/sdk/not/found46 PATH_SDK_WIN64SDK := $(PATH_DEVTOOLS)/win.amd64/sdk/not/found 44 47 endif 45 48 else -
trunk/kBuild/sdks/WINPSDK.kmk
r664 r692 29 29 # SDK Specific Properties 30 30 ifndef PATH_SDK_WINPSDK 31 PATH_SDK_WINPSDK := $( sort $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*))31 PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*) 32 32 ifeq ($(PATH_SDK_WINPSDK),) 33 PATH_SDK_WINPSDK := $( sort $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*))33 PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*) 34 34 endif 35 35 ifeq ($(PATH_SDK_WINPSDK),) 36 PATH_SDK_WINPSDK := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2*))36 PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*) 37 37 endif 38 38 ifeq ($(PATH_SDK_WINPSDK),) 39 PATH_SDK_WINPSDK := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*))39 PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*) 40 40 endif 41 41 ifeq ($(PATH_SDK_WINPSDK),) 42 PATH_SDK_WINPSDK := $( sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/sdk/2*))42 PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*) 43 43 endif 44 44 ifneq ($(PATH_SDK_WINPSDK),) 45 PATH_SDK_WINPSDK := $( call lastword,$(PATH_SDK_WINPSDK))45 PATH_SDK_WINPSDK := $(lastword $(sort $(PATH_SDK_WINPSDK))) 46 46 else 47 47 $(warning kBuild: PATH_SDK_WINPSDK couldn't be determined!) 48 PATH_SDK_WINPSDK := $(PATH_DEVTOOLS_BLD)/sdk/ /not/found48 PATH_SDK_WINPSDK := $(PATH_DEVTOOLS_BLD)/sdk/not/found 49 49 endif 50 50 else -
trunk/kBuild/sdks/WINPSDKINCS.kmk
r674 r692 33 33 # SDK Specific Properties 34 34 ifndef PATH_SDK_WINPSDKINCS 35 PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*)) 36 ifeq ($(PATH_SDK_WINPSDKINCS),) 37 PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*)) 38 endif 39 ifeq ($(PATH_SDK_WINPSDKINCS),) 40 PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2*)) 41 endif 42 ifeq ($(PATH_SDK_WINPSDKINCS),) 43 PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*)) 44 endif 45 ifeq ($(PATH_SDK_WINPSDKINCS),) 46 PATH_SDK_WINPSDKINCS := $(sort $(wildcard $(PATH_DEVTOOLS)/amd64.win/sdk/2*)) 47 endif 48 ifneq ($(PATH_SDK_WINPSDKINCS),) 49 PATH_SDK_WINPSDKINCS := $(call lastword,$(PATH_SDK_WINPSDKINCS)) 35 ifdef PATH_SDK_WINPSDK 36 PATH_SDK_WINPSDKINCS := $(PATH_SDK_WINPSDK) 50 37 else 51 $(warning kBuild: PATH_SDK_WINPSDKINCS couldn't be determined!) 52 PATH_SDK_WINPSDKINCS := $(PATH_DEVTOOLS_BLD)/sdk//not/found 38 PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*) 39 ifeq ($(PATH_SDK_WINPSDKINCS),) 40 PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*) 41 endif 42 ifeq ($(PATH_SDK_WINPSDKINCS),) 43 PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*) 44 endif 45 ifeq ($(PATH_SDK_WINPSDKINCS),) 46 PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*) 47 endif 48 ifeq ($(PATH_SDK_WINPSDKINCS),) 49 PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*) 50 endif 51 ifneq ($(PATH_SDK_WINPSDKINCS),) 52 PATH_SDK_WINPSDKINCS := $(lastword $(sort $(PATH_SDK_WINPSDKINCS))) 53 else 54 $(warning kBuild: PATH_SDK_WINPSDKINCS couldn't be determined!) 55 PATH_SDK_WINPSDKINCS := $(PATH_DEVTOOLS_BLD)/sdk/not/found 56 endif 53 57 endif 54 58 else -
trunk/kBuild/tools/MINGW32.kmk
r667 r692 29 29 # Tool Specific Properties 30 30 ifndef PATH_TOOL_MINGW32 31 PATH_TOOL_MINGW32 := $( sort $(wildcard $(PATH_DEVTOOLS_BLD)/mingw32/v*.*))31 PATH_TOOL_MINGW32 := $(wildcard $(PATH_DEVTOOLS_BLD)/mingw32/v*.*) 32 32 ifeq ($(PATH_TOOL_MINGW32),) 33 PATH_TOOL_MINGW32 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win/mingw32/v*.*))33 PATH_TOOL_MINGW32 := $(wildcard $(PATH_DEVTOOLS)/win.x86/mingw32/v*.*) 34 34 endif 35 35 ifeq ($(PATH_TOOL_MINGW32),) 36 PATH_TOOL_MINGW32 := $( sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/mingw32/v*.*))36 PATH_TOOL_MINGW32 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/mingw32/v*.*) 37 37 endif 38 38 ifneq ($(PATH_TOOL_MINGW32),) 39 PATH_TOOL_MINGW32 := $( call lastword,$(PATH_TOOL_MINGW32))39 PATH_TOOL_MINGW32 := $(lastword $(sort $(PATH_TOOL_MINGW32))) 40 40 endif 41 41 else … … 54 54 ifneq ($(BUILD_PLATFORM),win) 55 55 # we're cross compiling either using an emulator (wine/odin) or a cross compiler. 56 ifneq ($(PATH_TOOL_MINGW32),$(subst / x86.win,,$(PATH_TOOL_MINGW32)))56 ifneq ($(PATH_TOOL_MINGW32),$(subst /win.x86,,$(subst /x86.win,,$(PATH_TOOL_MINGW32)))) 57 57 TOOL_MINGW32_PREFIX := $(EXEC_X86_WIN32) $(TOOL_MINGW32_PREFIX) 58 58 TOOL_MINGW32_HOSTSUFF_EXE := .exe -
trunk/kBuild/tools/TAR.kmk
r688 r692 28 28 29 29 # Tool Specific Properties 30 ifndef TOOL_TAR_UNPACK 31 TOOL_TAR_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/tar$(HOSTSUFF_EXE)) 32 ifeq ($(TOOL_TAR_UNPACK),) 33 TOOL_TAR_UNPACK := tar$(HOSTSUFF_EXE) 30 ifndef TOOL_TAR_TAR 31 TOOL_TAR_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/tar/v*/tar$(HOSTSUFF_EXE)) 32 ifeq ($(TOOL_TAR_TAR),) 33 TOOL_TAR_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/tar$(HOSTSUFF_EXE)) 34 endif 35 ifeq ($(TOOL_TAR_TAR),) 36 TOOL_TAR_TAR := $(lastword $(sort $(TOOL_TAR_TAR))) 37 else 38 TOOL_TAR_TAR := tar$(HOSTSUFF_EXE) 34 39 endif 35 40 else 36 TOOL_TAR_ UNPACK := $(TOOL_TAR_UNPACK)41 TOOL_TAR_TAR := $(TOOL_TAR_TAR) 37 42 endif 43 TOOL_TAR_UNPACK ?= $(TOOL_TAR_TAR) 38 44 39 45 # General Properties used by kBuild -
trunk/kBuild/tools/TARGZ.kmk
r688 r692 28 28 29 29 # Tool Specific Properties 30 ifndef TOOL_TARGZ_UNPACK 31 TOOL_TARGZ_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/tar$(HOSTSUFF_EXE)) 32 ifeq ($(TOOL_TARGZ_UNPACK),) 33 TOOL_TARGZ_UNPACK := tar$(HOSTSUFF_EXE) 30 ifndef TOOL_TARGZ_TAR 31 TOOL_TARGZ_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/tar/v*/tar$(HOSTSUFF_EXE)) 32 ifeq ($(TOOL_TARGZ_TAR),) 33 TOOL_TARGZ_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/tar$(HOSTSUFF_EXE)) 34 endif 35 ifeq ($(TOOL_TARGZ_TAR),) 36 TOOL_TARGZ_TAR := $(TOOL_TAR_TAR) 37 endif 38 ifeq ($(TOOL_TARGZ_TAR),) 39 TOOL_TARGZ_TAR := $(lastword $(sort $(TOOL_TARGZ_TAR))) 40 else 41 TOOL_TARGZ_TAR := tar$(HOSTSUFF_EXE) 34 42 endif 35 43 else 36 TOOL_TARGZ_ UNPACK := $(TOOL_TARGZ_UNPACK)44 TOOL_TARGZ_TAR := $(TOOL_TARGZ_TAR) 37 45 endif 46 TOOL_TARGZ_UNPACK ?= $(TOOL_TARGZ_TAR) 38 47 39 48 # General Properties used by kBuild -
trunk/kBuild/tools/VCC70.kmk
r677 r692 29 29 # Tool Specific Properties 30 30 ifndef PATH_TOOL_VCC70 31 PATH_TOOL_VCC70 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v7 \ 32 $(PATH_DEVTOOLS)/x86.win32/vcc/v7 \ 33 $(PATH_DEVTOOLS)/x86.win32/vcc70) 34 ifeq ($(PATH_TOOL_VCC70),) 35 PATH_TOOL_VCC70 := $(firstword $(PATH_TOOL_VCC70)) 36 endif 31 PATH_TOOL_VCC70 := $(firstword $(wildcard \ 32 $(PATH_DEVTOOLS)/win.x86/vcc/v7 \ 33 $(PATH_DEVTOOLS)/x86.win32/vcc/v7 \ 34 $(PATH_DEVTOOLS)/x86.win32/vcc70) ) 37 35 # if not found, we'll enter 'pathless' mode. 38 36 else -
trunk/kBuild/tools/WGET.kmk
r667 r692 29 29 # Tool Specific Properties 30 30 ifndef TOOL_WGET_FETCH 31 TOOL_WGET_FETCH := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/wget$(HOSTSUFF_EXE)) 32 ifeq ($(TOOL_WGET_FETCH),) 31 TOOL_WGET_FETCH := $(wildcard $(PATH_DEVTOOLS_BLD)/wget/v*/wget$(HOSTSUFF_EXE)) 32 ifneq ($(TOOL_WGET_FETCH),) 33 TOOL_WGET_FETCH := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/wget$(HOSTSUFF_EXE)) 34 endif 35 ifneq ($(TOOL_WGET_FETCH),) 36 TOOL_WGET_FETCH := $(lastword $(sort $(TOOL_WGET_FETCH))) 37 else 33 38 TOOL_WGET_FETCH := wget$(HOSTSUFF_EXE) 34 39 endif -
trunk/kBuild/tools/ZIP.kmk
r688 r692 29 29 # Tool Specific Properties 30 30 ifndef TOOL_ZIP_UNPACK 31 TOOL_ZIP_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/unzip $(HOSTSUFF_EXE))31 TOOL_ZIP_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/unzip/v*/unzip$(HOSTSUFF_EXE)) 32 32 ifeq ($(TOOL_ZIP_UNPACK),) 33 TOOL_ZIP_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/zip/v*/unzip$(HOSTSUFF_EXE)) 34 endif 35 ifeq ($(TOOL_ZIP_UNPACK),) 36 TOOL_ZIP_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/unzip$(HOSTSUFF_EXE)) 37 endif 38 ifneq ($(TOOL_ZIP_UNPACK),) 39 TOOL_ZIP_UNPACK := $(lastword $(sort $(TOOL_ZIP_UNPACK))) 40 else 33 41 TOOL_ZIP_UNPACK := unzip$(HOSTSUFF_EXE) 34 42 endif … … 36 44 TOOL_ZIP_UNPACK := $(TOOL_ZIP_UNPACK) 37 45 endif 46 #ifndef TOOL_ZIP_PACK 47 # TOOL_ZIP_PACK := $(wildcard $(PATH_DEVTOOLS_BLD)/zip/v*/zip$(HOSTSUFF_EXE)) 48 # ifeq ($(TOOL_ZIP_PACK),) 49 # TOOL_ZIP_PACK := $(wildcard $(PATH_DEVTOOLS_BLD)/unzip/v*/zip$(HOSTSUFF_EXE)) 50 # endif 51 # ifeq ($(TOOL_ZIP_PACK),) 52 # TOOL_ZIP_PACK := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/zip$(HOSTSUFF_EXE)) 53 # endif 54 # ifneq ($(TOOL_ZIP_PACK),) 55 # TOOL_ZIP_PACK := $(lastword $(sort $(TOOL_ZIP_PACK))) 56 # else 57 # TOOL_ZIP_PACK := zip$(HOSTSUFF_EXE) 58 # endif 59 #else 60 # TOOL_ZIP_PACK := $(TOOL_ZIP_PACK) 61 #endif 38 62 39 63 # General Properties used by kBuild
Note:
See TracChangeset
for help on using the changeset viewer.
