Changeset 667 for trunk/kBuild/tools


Ignore:
Timestamp:
Dec 6, 2006, 5:00:16 AM (19 years ago)
Author:
bird
Message:

cleanup. PATH_DEV* -> PATH_DEVTOOLS*.

Location:
trunk/kBuild/tools
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/ALP.kmk

    r665 r667  
    44# kBuild Tool Config - ALP or later.
    55#
    6 # Copyright (c) 2005 knut st. osmundsen <bird-srcspam@anduin.net>
     6# Copyright (c) 2005-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    77#
    88#
    … …  
    2525#
    2626
     27TOOL_ALP := The IBM Assembly Language Processor
    2728
    28 TOOL_ALP                     := IBM Assembly Language Processor
    29 #ifndef PATH_TOOL_ALP
    30 #PATH_TOOL_ALP                := $(sort $(wildcard $(PATH_DEV_BLD)/alp/v*.*))
    31 #ifneq ($(PATH_TOOL_ALP),)
    32 #PATH_TOOL_ALP                := $(call lastword,$(PATH_TOOL_ALP))
    33 #endif
    34 #endif
     29# Tool Specific Properties
     30ifndef PATH_TOOL_ALP
     31 PATH_TOOL_ALP := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/alp/v*.*))
     32 ifneq ($(PATH_TOOL_ALP),)
     33  PATH_TOOL_ALP := $(call lastword,$(PATH_TOOL_ALP))
     34 endif
     35endif
     36ifneq ($(PATH_TOOL_ALP),)
     37 TOOL_ALP_AS ?= $(PATH_TOOL_ALP)/alp$(HOSTSUFF_EXE)
     38else
     39 TOOL_ALP_AS ?= alp$(HOSTSUFF_EXE)
     40endif
    3541
    36 ifneq ($(PATH_TOOL_ALP),)
    37 TOOL_ALP_AS                  ?= $(PATH_TOOL_ALP)/alp$(HOSTSUFF_EXE)
    38 else
    39 TOOL_ALP_AS                  ?= alp$(HOSTSUFF_EXE)
    40 endif
    41 TOOL_ALP_ASFLAGS             ?= -Mb
     42# General Properties used by kBuild
     43TOOL_ALP_ASFLAGS ?= -Mb
    4244
    4345

  • trunk/kBuild/tools/GCC.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - Generic GCC.
     4# kBuild Tool Config - Generic GCC Using The System GCC.
    55#
    66# Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2525#
    2626
    27 
    28 TOOL_GCC                    := Generic GCC
    29 
    30 TOOL_GCC_CC                 ?= gcc$(HOSTSUFF_EXE)
    31 TOOL_GCC_COBJSUFF           ?= .o
    32 TOOL_GCC_CFLAGS             ?=
    33 TOOL_GCC_CFLAGS.debug       ?= -g
    34 TOOL_GCC_CFLAGS.profile     ?= -g -O2 #-pg
    35 TOOL_GCC_CFLAGS.release     ?= -O2
    36 TOOL_GCC_CINCS              ?=
    37 TOOL_GCC_CDEFS              ?=
    38 
    39 TOOL_GCC_CXX                ?= g++$(HOSTSUFF_EXE)
    40 TOOL_GCC_CXXOBJSUFF         ?= .o
    41 TOOL_GCC_CXXOBJSUFF         ?= .o
    42 TOOL_GCC_CXXFLAGS           ?=
    43 TOOL_GCC_CXXFLAGS.debug     ?= -g -O0
    44 TOOL_GCC_CXXFLAGS.profile   ?= -g -O2 #-pg
    45 TOOL_GCC_CXXFLAGS.release   ?= -O2
    46 TOOL_GCC_CXXINCS            ?=
    47 TOOL_GCC_CXXDEFS            ?=
    48 
    49 TOOL_GCC_AS                 ?= gcc$(HOSTSUFF_EXE)
    50 TOOL_GCC_ASFLAGS            ?= -x assembler-with-cpp
    51 TOOL_GCC_ASFLAGS.debug      ?= -g
    52 TOOL_GCC_ASFLAGS.profile    ?= -g
    53 TOOL_GCC_ASOBJSUFF          ?= .o
    54 
    55 TOOL_GCC_AR                 ?= ar$(HOSTSUFF_EXE)
    56 TOOL_GCC_ARFLAGS            ?= cr
    57 TOOL_GCC_ARLIBSUFF          ?= .a
    58 
    59 TOOL_GCC_LD                 ?= g++$(HOSTSUFF_EXE)
    60 TOOL_GCC_LDFLAGS            ?=
    61 TOOL_GCC_LDFLAGS.debug      ?= -g
    62 TOOL_GCC_LDFLAGS.profile    ?= -g
    63 TOOL_GCC_LDFLAGS.dll.os2    ?= -Zdll
     27TOOL_GCC := Generic GCC Using The System GCC.
     28
     29# Tool Specific Properties
     30TOOL_GCC_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GCC_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GCC_AS  ?= gcc$(HOSTSUFF_EXE)
     33TOOL_GCC_AR  ?= ar$(HOSTSUFF_EXE)
     34TOOL_GCC_LD  ?= g++$(HOSTSUFF_EXE)
     35TOOL_GCC_LDFLAGS.dll.os2 ?= -Zdll
    6436ifndef TOOL_GCC_LDFLAGS.$(BUILD_TARGET)
    65 TOOL_GCC_LDFLAGS.dll        ?= -shared
     37TOOL_GCC_LDFLAGS.dll ?= -shared
    6638else
    67 TOOL_GCC_LDFLAGS.dll        ?= $(TOOL_GCC_LDFLAGS.$(BUILD_TARGET))
     39TOOL_GCC_LDFLAGS.dll ?= $(TOOL_GCC_LDFLAGS.$(BUILD_TARGET))
    6840endif
     41
     42# General Properties used by kBuild
     43TOOL_GCC_COBJSUFF         ?= .o
     44TOOL_GCC_CFLAGS           ?=
     45TOOL_GCC_CFLAGS.debug     ?= -g
     46TOOL_GCC_CFLAGS.profile   ?= -g -O2 #-pg
     47TOOL_GCC_CFLAGS.release   ?= -O2
     48TOOL_GCC_CINCS            ?=
     49TOOL_GCC_CDEFS            ?=
     50
     51TOOL_GCC_CXXOBJSUFF       ?= .o
     52TOOL_GCC_CXXOBJSUFF       ?= .o
     53TOOL_GCC_CXXFLAGS         ?=
     54TOOL_GCC_CXXFLAGS.debug   ?= -g -O0
     55TOOL_GCC_CXXFLAGS.profile ?= -g -O2 #-pg
     56TOOL_GCC_CXXFLAGS.release ?= -O2
     57TOOL_GCC_CXXINCS          ?=
     58TOOL_GCC_CXXDEFS          ?=
     59
     60TOOL_GCC_ASFLAGS          ?= -x assembler-with-cpp
     61TOOL_GCC_ASFLAGS.debug    ?= -g
     62TOOL_GCC_ASFLAGS.profile  ?= -g
     63TOOL_GCC_ASOBJSUFF        ?= .o
     64
     65TOOL_GCC_ARFLAGS          ?= cr
     66TOOL_GCC_ARLIBSUFF        ?= .a
     67
     68TOOL_GCC_LDFLAGS          ?=
     69TOOL_GCC_LDFLAGS.debug    ?= -g
     70TOOL_GCC_LDFLAGS.profile  ?= -g
    6971
    7072

  • trunk/kBuild/tools/GCC3.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - Generic GCC.
     4# kBuild Tool Config - Generic GCC v3.2.x or later Using The System GCC.
    55#
    66# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC3                    := Generic GCC v3
    28 
    29 TOOL_GCC3_CC                 ?= gcc$(HOSTSUFF_EXE)
    30 TOOL_GCC3_COBJSUFF           ?= .o
    31 TOOL_GCC3_CFLAGS             ?=
    32 TOOL_GCC3_CFLAGS.debug       ?= -g
    33 TOOL_GCC3_CFLAGS.profile     ?= -g -O2 #-pg
    34 TOOL_GCC3_CFLAGS.release     ?= -O2
    35 TOOL_GCC3_CINCS              ?=
    36 TOOL_GCC3_CDEFS              ?=
    37 
    38 TOOL_GCC3_CXX                ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GCC3_CXXOBJSUFF         ?= .o
    40 TOOL_GCC3_CXXOBJSUFF         ?= .o
    41 TOOL_GCC3_CXXFLAGS           ?=
    42 TOOL_GCC3_CXXFLAGS.debug     ?= -g
    43 TOOL_GCC3_CXXFLAGS.profile   ?= -g -O2 #-pg
    44 TOOL_GCC3_CXXFLAGS.release   ?= -O2
    45 TOOL_GCC3_CXXINCS            ?=
    46 TOOL_GCC3_CXXDEFS            ?=
    47 
    48 TOOL_GCC3_AS                 ?= gcc$(HOSTSUFF_EXE)
    49 TOOL_GCC3_ASFLAGS            ?= -x assembler-with-cpp
    50 TOOL_GCC3_ASFLAGS.debug      ?= -g
    51 TOOL_GCC3_ASFLAGS.profile    ?= -g
    52 TOOL_GCC3_ASOBJSUFF          ?= .o
    53 
    54 TOOL_GCC3_AR                 ?= ar$(HOSTSUFF_EXE)
    55 TOOL_GCC3_ARFLAGS            ?= cr
    56 TOOL_GCC3_ARLIBSUFF          ?= .a
    57 
     27TOOL_GCC3 := Generic GCC v3.2.x or later Using The System GCC.
     28
     29# Tool Specific Properties
     30TOOL_GCC3_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GCC3_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GCC3_AS  ?= gcc$(HOSTSUFF_EXE)
     33TOOL_GCC3_AR  ?= ar$(HOSTSUFF_EXE)
    5834ifeq ($(BUILD_TARGET),os2)
    59 TOOL_GCC3_AR_IMP             ?= emximp$(HOSTSTUFF_EXE)
     35TOOL_GCC3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
    6036else
    61 TOOL_GCC3_AR_IMP             ?= $(ECHO) not supported!
    62 endif
    63 
    64 TOOL_GCC3_LD                 ?= g++$(HOSTSUFF_EXE)
    65 TOOL_GCC3_LD_SYSMOD          ?= ld$(HOSTSUFF_EXE)
    66 TOOL_GCC3_LDFLAGS            ?=
    67 TOOL_GCC3_LDFLAGS.debug      ?= -g
    68 TOOL_GCC3_LDFLAGS.profile    ?= -g
     37TOOL_GCC3_AR_IMP ?= $(ECHO) not supported!
     38endif
     39TOOL_GCC3_LD ?= g++$(HOSTSUFF_EXE)
     40TOOL_GCC3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    6941ifndef TOOL_GCC3_LDFLAGS.$(BUILD_TARGET)
    70 TOOL_GCC3_LDFLAGS.dll        ?= -shared
     42TOOL_GCC3_LDFLAGS.dll ?= -shared
    7143else
    72 TOOL_GCC3_LDFLAGS.dll        ?= $(TOOL_GCC3_LDFLAGS.$(BUILD_TARGET))
    73 endif
    74 TOOL_GCC3_LDFLAGS.sysmod     ?= -r
    75 TOOL_GCC3_LD_SONAME          ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     44TOOL_GCC3_LDFLAGS.dll ?= $(TOOL_GCC3_LDFLAGS.$(BUILD_TARGET))
     45endif
     46TOOL_GCC3_LDFLAGS.sysmod ?= -r
     47TOOL_GCC3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    7648ifeq ($(BUILD_TARGET),os2)
    77 TOOL_GCC3_LD_MAP             ?= -Zmap=$(1)
    78 TOOL_GCC3_LD_SYSMOD_MAP      ?= -Zmap=$(1)
     49TOOL_GCC3_LD_MAP ?= -Zmap=$(1)
     50TOOL_GCC3_LD_SYSMOD_MAP ?= -Zmap=$(1)
    7951else
    80 TOOL_GCC3_LD_MAP             ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    81 TOOL_GCC3_LD_SYSMOD_MAP      ?= -Map $(1) --cref
     52TOOL_GCC3_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     53TOOL_GCC3_LD_SYSMOD_MAP ?= -Map $(1) --cref
    8254endif
    8355ifdef SLKRUNS
    … …  
    8557TOOL_GCC3_CXX += -fmessage-length=0
    8658endif
     59
     60# General Properties used by kBuild
     61TOOL_GCC3_COBJSUFF         ?= .o
     62TOOL_GCC3_CFLAGS           ?=
     63TOOL_GCC3_CFLAGS.debug     ?= -g
     64TOOL_GCC3_CFLAGS.profile   ?= -g -O2 #-pg
     65TOOL_GCC3_CFLAGS.release   ?= -O2
     66TOOL_GCC3_CINCS            ?=
     67TOOL_GCC3_CDEFS            ?=
     68
     69TOOL_GCC3_CXXOBJSUFF       ?= .o
     70TOOL_GCC3_CXXOBJSUFF       ?= .o
     71TOOL_GCC3_CXXFLAGS         ?=
     72TOOL_GCC3_CXXFLAGS.debug   ?= -g
     73TOOL_GCC3_CXXFLAGS.profile ?= -g -O2 #-pg
     74TOOL_GCC3_CXXFLAGS.release ?= -O2
     75TOOL_GCC3_CXXINCS          ?=
     76TOOL_GCC3_CXXDEFS          ?=
     77
     78TOOL_GCC3_ASFLAGS          ?= -x assembler-with-cpp
     79TOOL_GCC3_ASFLAGS.debug    ?= -g
     80TOOL_GCC3_ASFLAGS.profile  ?= -g
     81TOOL_GCC3_ASOBJSUFF        ?= .o
     82
     83TOOL_GCC3_ARFLAGS          ?= cr
     84TOOL_GCC3_ARLIBSUFF        ?= .a
     85
     86TOOL_GCC3_LDFLAGS          ?=
     87TOOL_GCC3_LDFLAGS.debug    ?= -g
     88TOOL_GCC3_LDFLAGS.profile  ?= -g
    8789
    8890

  • trunk/kBuild/tools/GCC32.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - 32-bit GCC, elf.
     4# kBuild Tool Config - Generic 32-bit GCC v3.2.x or later Using The System GCC.
    55#
    66# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC32                    := Generic GCC v3 32-bit
    28 
    29 TOOL_GCC32_CC                 ?= gcc32$(HOSTSUFF_EXE)
    30 TOOL_GCC32_COBJSUFF           ?= .o
    31 TOOL_GCC32_CFLAGS             ?=
    32 TOOL_GCC32_CFLAGS.debug       ?= -g
    33 TOOL_GCC32_CFLAGS.profile     ?= -g -O2 #-pg
    34 TOOL_GCC32_CFLAGS.release     ?= -O2
    35 TOOL_GCC32_CINCS              ?=
    36 TOOL_GCC32_CDEFS              ?=
    37 
    38 TOOL_GCC32_CXX                ?= g++32$(HOSTSUFF_EXE)
    39 TOOL_GCC32_CXXOBJSUFF         ?= .o
    40 TOOL_GCC32_CXXOBJSUFF         ?= .o
    41 TOOL_GCC32_CXXFLAGS           ?=
    42 TOOL_GCC32_CXXFLAGS.debug     ?= -g
    43 TOOL_GCC32_CXXFLAGS.profile   ?= -g -O2 #-pg
    44 TOOL_GCC32_CXXFLAGS.release   ?= -O2
    45 TOOL_GCC32_CXXINCS            ?=
    46 TOOL_GCC32_CXXDEFS            ?=
    47 
    48 TOOL_GCC32_AS                 ?= gcc32$(HOSTSUFF_EXE)
    49 TOOL_GCC32_ASFLAGS            ?= -x assembler-with-cpp
    50 TOOL_GCC32_ASFLAGS.debug      ?= -g
    51 TOOL_GCC32_ASFLAGS.profile    ?= -g
    52 TOOL_GCC32_ASOBJSUFF          ?= .o
    53 
    54 TOOL_GCC32_AR                 ?= ar$(HOSTSUFF_EXE)
    55 TOOL_GCC32_ARFLAGS            ?= cr
    56 TOOL_GCC32_ARLIBSUFF          ?= .a
    57 
    58 TOOL_GCC32_LD                 ?= g++32$(HOSTSUFF_EXE)
    59 TOOL_GCC32_LD_SYSMOD          ?= ld$(HOSTSUFF_EXE)
    60 TOOL_GCC32_LDFLAGS            ?=
    61 TOOL_GCC32_LDFLAGS.debug      ?= -g
    62 TOOL_GCC32_LDFLAGS.profile    ?= -g
     27TOOL_GCC32 := Generic 32-bit GCC v3.2.x or later Using The System GCC. \
     28        More or less Linux/ELF specfic.
     29
     30# Tool Specific Properties
     31TOOL_GCC32_CC  ?= gcc32$(HOSTSUFF_EXE)
     32TOOL_GCC32_CXX ?= g++32$(HOSTSUFF_EXE)
     33TOOL_GCC32_AS  ?= gcc32$(HOSTSUFF_EXE)
     34TOOL_GCC32_AR  ?= ar$(HOSTSUFF_EXE)
     35TOOL_GCC32_LD  ?= g++32$(HOSTSUFF_EXE)
     36TOOL_GCC32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    6337ifndef TOOL_GCC32_LDFLAGS.$(BUILD_TARGET)
    64 TOOL_GCC32_LDFLAGS.dll        ?= -shared
     38TOOL_GCC32_LDFLAGS.dll ?= -shared
    6539else
    66 TOOL_GCC32_LDFLAGS.dll        ?= $(TOOL_GCC32_LDFLAGS.$(BUILD_TARGET))
    67 endif
    68 TOOL_GCC32_LDFLAGS.sysmod     ?= -r -m elf_i386
    69 TOOL_GCC32_LD_SONAME          ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     40TOOL_GCC32_LDFLAGS.dll ?= $(TOOL_GCC32_LDFLAGS.$(BUILD_TARGET))
     41endif
     42TOOL_GCC32_LDFLAGS.sysmod ?= -r -m elf_i386
     43TOOL_GCC32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    7044ifeq ($(BUILD_TARGET),os2)
    71 TOOL_GCC32_LD_MAP             ?= -Zmap=$(1)
     45TOOL_GCC32_LD_MAP ?= -Zmap=$(1)
    7246else
    73 TOOL_GCC32_LD_MAP             ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     47TOOL_GCC32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    7448endif
    7549ifeq ($(BUILD_TARGET),os2)
    76 TOOL_GCC32_LD_SYSMOD_MAP      ?= -Zmap=$(1)
     50TOOL_GCC32_LD_SYSMOD_MAP ?= -Zmap=$(1)
    7751else
    78 TOOL_GCC32_LD_SYSMOD_MAP      ?= -Map $(1) --cref
     52TOOL_GCC32_LD_SYSMOD_MAP ?= -Map $(1) --cref
    7953endif
    8054ifdef SLKRUNS
    … …  
    8256TOOL_GCC32_CXX += -fmessage-length=0
    8357endif
     58
     59# General Properties used by kBuild
     60TOOL_GCC32_COBJSUFF         ?= .o
     61TOOL_GCC32_CFLAGS           ?=
     62TOOL_GCC32_CFLAGS.debug     ?= -g
     63TOOL_GCC32_CFLAGS.profile   ?= -g -O2 #-pg
     64TOOL_GCC32_CFLAGS.release   ?= -O2
     65TOOL_GCC32_CINCS            ?=
     66TOOL_GCC32_CDEFS            ?=
     67
     68TOOL_GCC32_CXXOBJSUFF       ?= .o
     69TOOL_GCC32_CXXOBJSUFF       ?= .o
     70TOOL_GCC32_CXXFLAGS         ?=
     71TOOL_GCC32_CXXFLAGS.debug   ?= -g
     72TOOL_GCC32_CXXFLAGS.profile ?= -g -O2 #-pg
     73TOOL_GCC32_CXXFLAGS.release ?= -O2
     74TOOL_GCC32_CXXINCS          ?=
     75TOOL_GCC32_CXXDEFS          ?=
     76
     77TOOL_GCC32_ASFLAGS          ?= -x assembler-with-cpp
     78TOOL_GCC32_ASFLAGS.debug    ?= -g
     79TOOL_GCC32_ASFLAGS.profile  ?= -g
     80TOOL_GCC32_ASOBJSUFF        ?= .o
     81
     82TOOL_GCC32_ARFLAGS          ?= cr
     83TOOL_GCC32_ARLIBSUFF        ?= .a
     84
     85TOOL_GCC32_LDFLAGS          ?=
     86TOOL_GCC32_LDFLAGS.debug    ?= -g
     87TOOL_GCC32_LDFLAGS.profile  ?= -g
    8488
    8589

  • trunk/kBuild/tools/GCC3OMF.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - OS/2 GCC v3 OMF.
    5 #
    6 # Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
     4# kBuild Tool Config - GCC v3 targeting OS/2 OMF.
     5#
     6# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    77#
    88#
    … …  
    2525#
    2626
    27 TOOL_GCC3OMF                    := OS/2 GCC v3 OMF
    28 
    29 TOOL_GCC3OMF_CC                 ?= gcc$(HOSTSUFF_EXE)
    30 TOOL_GCC3OMF_COBJSUFF           ?= .o
    31 TOOL_GCC3OMF_CFLAGS             ?= -Zomf
    32 TOOL_GCC3OMF_CFLAGS.debug       ?= -g
    33 TOOL_GCC3OMF_CFLAGS.profile     ?= -g -O2 #-pg
    34 TOOL_GCC3OMF_CFLAGS.release     ?= -O2
    35 TOOL_GCC3OMF_CINCS              ?=
    36 TOOL_GCC3OMF_CDEFS              ?=
    37 
    38 TOOL_GCC3OMF_CXX                ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GCC3OMF_CXXOBJSUFF         ?= .o
    40 TOOL_GCC3OMF_CXXOBJSUFF         ?= .o
    41 TOOL_GCC3OMF_CXXFLAGS           ?= -Zomf
    42 TOOL_GCC3OMF_CXXFLAGS.debug     ?= -g
    43 TOOL_GCC3OMF_CXXFLAGS.profile   ?= -g -O2 #-pg
    44 TOOL_GCC3OMF_CXXFLAGS.release   ?= -O2
    45 TOOL_GCC3OMF_CXXINCS            ?=
    46 TOOL_GCC3OMF_CXXDEFS            ?=
    47 
    48 TOOL_GCC3OMF_AS                 ?= gcc$(HOSTSUFF_EXE)
    49 TOOL_GCC3OMF_ASFLAGS            ?= -x assembler-with-cpp
    50 TOOL_GCC3OMF_ASFLAGS.debug      ?= -g
    51 TOOL_GCC3OMF_ASFLAGS.profile    ?= -g
    52 TOOL_GCC3OMF_ASOBJSUFF          ?= .obj
    53 
    54 TOOL_GCC3OMF_AR                 ?= emxomfar$(HOSTSUFF_EXE)
    55 TOOL_GCC3OMF_ARFLAGS            ?= cr
    56 TOOL_GCC3OMF_ARLIBSUFF          ?= .lib
    57 TOOL_GCC3OMF_AR_IMP             ?= emximp$(HOSTSUFF_EXE)
    58 
    59 TOOL_GCC3OMF_LD                 ?= g++$(HOSTSUFF_EXE)
    60 TOOL_GCC3OMF_LD_SYSMOD          ?= g++$(HOSTSUFF_EXE)
    61 TOOL_GCC3OMF_LDFLAGS            ?= -Zomf
    62 TOOL_GCC3OMF_LDFLAGS.debug      ?= -g
    63 TOOL_GCC3OMF_LDFLAGS.profile    ?= -g
     27TOOL_GCC3OMF := GCC v3 targeting OS/2 OMF.
     28
     29# Tool Specific Properties
     30TOOL_GCC3OMF_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GCC3OMF_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GCC3OMF_AS  ?= gcc$(HOSTSUFF_EXE)
     33TOOL_GCC3OMF_AR  ?= emxomfar$(HOSTSUFF_EXE)
     34TOOL_GCC3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE)
     35TOOL_GCC3OMF_LD ?= g++$(HOSTSUFF_EXE)
     36TOOL_GCC3OMF_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
    6437ifndef TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET)
    65 TOOL_GCC3OMF_LDFLAGS.dll        ?= -shared -Zdll
     38TOOL_GCC3OMF_LDFLAGS.dll ?= -shared -Zdll
    6639else
    67 TOOL_GCC3OMF_LDFLAGS.dll        ?= $(TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET))
     40TOOL_GCC3OMF_LDFLAGS.dll ?= $(TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET))
    6841endif
    69 TOOL_GCC3OMF_LDFLAGS.sysmod     ?= -nostdlib
    70 TOOL_GCC3OMF_LD_MAP             ?= -Zmap=$(1)
    71 TOOL_GCC3OMF_LD_SYSMOD_MAP      ?= -Zmap=$(1)
     42TOOL_GCC3OMF_LDFLAGS.sysmod ?= -nostdlib
     43TOOL_GCC3OMF_LD_MAP ?= -Zmap=$(1)
     44TOOL_GCC3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
    7245
    7346ifdef SLKRUNS
    … …  
    7548TOOL_GCC3OMF_CXX += -fmessage-length=0
    7649endif
     50
     51# General Properties used by kBuild
     52TOOL_GCC3OMF_COBJSUFF         ?= .o
     53TOOL_GCC3OMF_CFLAGS           ?= -Zomf
     54TOOL_GCC3OMF_CFLAGS.debug     ?= -g
     55TOOL_GCC3OMF_CFLAGS.profile   ?= -g -O2 #-pg
     56TOOL_GCC3OMF_CFLAGS.release   ?= -O2
     57TOOL_GCC3OMF_CINCS            ?=
     58TOOL_GCC3OMF_CDEFS            ?=
     59
     60TOOL_GCC3OMF_CXXOBJSUFF       ?= .o
     61TOOL_GCC3OMF_CXXOBJSUFF       ?= .o
     62TOOL_GCC3OMF_CXXFLAGS         ?= -Zomf
     63TOOL_GCC3OMF_CXXFLAGS.debug   ?= -g
     64TOOL_GCC3OMF_CXXFLAGS.profile ?= -g -O2 #-pg
     65TOOL_GCC3OMF_CXXFLAGS.release ?= -O2
     66TOOL_GCC3OMF_CXXINCS          ?=
     67TOOL_GCC3OMF_CXXDEFS          ?=
     68
     69TOOL_GCC3OMF_ASFLAGS          ?= -x assembler-with-cpp
     70TOOL_GCC3OMF_ASFLAGS.debug    ?= -g
     71TOOL_GCC3OMF_ASFLAGS.profile  ?= -g
     72TOOL_GCC3OMF_ASOBJSUFF        ?= .obj
     73
     74TOOL_GCC3OMF_ARFLAGS          ?= cr
     75TOOL_GCC3OMF_ARLIBSUFF        ?= .lib
     76
     77TOOL_GCC3OMF_LDFLAGS          ?= -Zomf
     78TOOL_GCC3OMF_LDFLAGS.debug    ?= -g
     79TOOL_GCC3OMF_LDFLAGS.profile  ?= -g
    7780
    7881

  • trunk/kBuild/tools/GCC4MACHO.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - Darwin / Mac OS X / Mach-O GCC (v4).
     4# kBuild Tool Config - GCC v4 targeting Darwin (Mac OS X) Mach-o.
    55#
    66# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC4MACHO                    := Mach-O GCC v4
    28 
    29 TOOL_GCC4MACHO_CC                 ?= gcc$(HOSTSUFF_EXE)
    30 TOOL_GCC4MACHO_COBJSUFF           ?= .o
    31 TOOL_GCC4MACHO_CFLAGS             ?=
    32 TOOL_GCC4MACHO_CFLAGS.debug       ?= -g
    33 TOOL_GCC4MACHO_CFLAGS.profile     ?= -g -O2 #-pg
    34 TOOL_GCC4MACHO_CFLAGS.release     ?= -O2
    35 TOOL_GCC4MACHO_CINCS              ?=
    36 TOOL_GCC4MACHO_CDEFS              ?=
    37 
    38 TOOL_GCC4MACHO_CXX                ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GCC4MACHO_CXXOBJSUFF         ?= .o
    40 TOOL_GCC4MACHO_CXXOBJSUFF         ?= .o
    41 TOOL_GCC4MACHO_CXXFLAGS           ?=
    42 TOOL_GCC4MACHO_CXXFLAGS.debug     ?= -g
    43 TOOL_GCC4MACHO_CXXFLAGS.profile   ?= -g -O2 #-pg
    44 TOOL_GCC4MACHO_CXXFLAGS.release   ?= -O2
    45 TOOL_GCC4MACHO_CXXINCS            ?=
    46 TOOL_GCC4MACHO_CXXDEFS            ?=
    47 
    48 TOOL_GCC4MACHO_AS                 ?= gcc$(HOSTSUFF_EXE)
    49 TOOL_GCC4MACHO_ASFLAGS            ?= -x assembler-with-cpp
    50 TOOL_GCC4MACHO_ASFLAGS.debug      ?= -g
    51 TOOL_GCC4MACHO_ASFLAGS.profile    ?= -g
    52 TOOL_GCC4MACHO_ASOBJSUFF          ?= .o
    53 
    54 TOOL_GCC4MACHO_AR                 ?= ar$(HOSTSUFF_EXE)
    55 TOOL_GCC4MACHO_ARFLAGS            ?= -c -rs
    56 TOOL_GCC4MACHO_ARLIBSUFF          ?= .a
    57 
    58 TOOL_GCC4MACHO_AR_IMP             ?= $(ECHO) not supported!
    59 
    60 TOOL_GCC4MACHO_LD                 ?= g++$(HOSTSUFF_EXE)
    61 TOOL_GCC4MACHO_LD_SYSMOD          ?= g++$(HOSTSUFF_EXE)
    62 TOOL_GCC4MACHO_LDFLAGS            ?=
    63 TOOL_GCC4MACHO_LDFLAGS.debug      ?= -g
    64 TOOL_GCC4MACHO_LDFLAGS.profile    ?= -g
     27TOOL_GCC4MACHO := GCC v4 targeting Darwin (Mac OS X) Mach-o.
     28
     29# Tool Specific Properties
     30TOOL_GCC4MACHO_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GCC4MACHO_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GCC4MACHO_AS  ?= gcc$(HOSTSUFF_EXE)
     33TOOL_GCC4MACHO_AR_IMP ?= $(ECHO) not supported!
     34TOOL_GCC4MACHO_LD ?= g++$(HOSTSUFF_EXE)
     35TOOL_GCC4MACHO_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
    6536ifndef TOOL_GCC4MACHO_LDFLAGS.$(BUILD_TARGET)
    66 TOOL_GCC4MACHO_LDFLAGS.dll        ?= -dynamiclib
     37TOOL_GCC4MACHO_LDFLAGS.dll ?= -dynamiclib
    6738else
    68 TOOL_GCC4MACHO_LDFLAGS.dll        ?= $(TOOL_GCC4MACHO_LDFLAGS.$(BUILD_TARGET))
     39TOOL_GCC4MACHO_LDFLAGS.dll ?= $(TOOL_GCC4MACHO_LDFLAGS.$(BUILD_TARGET))
    6940endif
    70 TOOL_GCC4MACHO_LDFLAGS.sysmod     ?= -r
    71 #TOOL_GCC4MACHO_LD_SONAME           = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    72 TOOL_GCC4MACHO_LD_MAP             ?=
    73 TOOL_GCC4MACHO_LD_SYSMOD_MAP      ?=
     41TOOL_GCC4MACHO_LDFLAGS.sysmod ?= -r
     42#TOOL_GCC4MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     43TOOL_GCC4MACHO_LD_MAP ?=
     44TOOL_GCC4MACHO_LD_SYSMOD_MAP ?=
    7445
    7546ifdef SLKRUNS
    … …  
    7748TOOL_GCC4MACHO_CXX += -fmessage-length=0
    7849endif
     50
     51# General Properties used by kBuild
     52TOOL_GCC4MACHO_COBJSUFF         ?= .o
     53TOOL_GCC4MACHO_CFLAGS           ?=
     54TOOL_GCC4MACHO_CFLAGS.debug     ?= -g
     55TOOL_GCC4MACHO_CFLAGS.profile   ?= -g -O2 #-pg
     56TOOL_GCC4MACHO_CFLAGS.release   ?= -O2
     57TOOL_GCC4MACHO_CINCS            ?=
     58TOOL_GCC4MACHO_CDEFS            ?=
     59
     60TOOL_GCC4MACHO_CXXOBJSUFF       ?= .o
     61TOOL_GCC4MACHO_CXXOBJSUFF       ?= .o
     62TOOL_GCC4MACHO_CXXFLAGS         ?=
     63TOOL_GCC4MACHO_CXXFLAGS.debug   ?= -g
     64TOOL_GCC4MACHO_CXXFLAGS.profile ?= -g -O2 #-pg
     65TOOL_GCC4MACHO_CXXFLAGS.release ?= -O2
     66TOOL_GCC4MACHO_CXXINCS          ?=
     67TOOL_GCC4MACHO_CXXDEFS          ?=
     68
     69TOOL_GCC4MACHO_ASFLAGS          ?= -x assembler-with-cpp
     70TOOL_GCC4MACHO_ASFLAGS.debug    ?= -g
     71TOOL_GCC4MACHO_ASFLAGS.profile  ?= -g
     72TOOL_GCC4MACHO_ASOBJSUFF        ?= .o
     73
     74TOOL_GCC4MACHO_AR               ?= ar$(HOSTSUFF_EXE)
     75TOOL_GCC4MACHO_ARFLAGS          ?= -c -rs
     76TOOL_GCC4MACHO_ARLIBSUFF        ?= .a
     77
     78TOOL_GCC4MACHO_LDFLAGS          ?=
     79TOOL_GCC4MACHO_LDFLAGS.debug    ?= -g
     80TOOL_GCC4MACHO_LDFLAGS.profile  ?= -g
    7981
    8082

  • trunk/kBuild/tools/MINGW32.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - MINGW32 GCC.
     4# kBuild Tool Config - MinGW32 GCC v3.3+.
    55#
    66# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_MINGW32                 := MinGW32 GCC v3.3+
    28 
    29 # find latest installed version
     27TOOL_MINGW32 := MinGW32 GCC v3.3+.
     28
     29# Tool Specific Properties
    3030ifndef PATH_TOOL_MINGW32
    31  PATH_DEV_BLD                ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
    32  PATH_TOOL_MINGW32           := $(sort $(wildcard $(PATH_DEV_BLD)/mingw32/v*.*))
     31 PATH_TOOL_MINGW32 := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/mingw32/v*.*))
    3332 ifeq ($(PATH_TOOL_MINGW32),)
    34   PATH_TOOL_MINGW32          := $(sort $(wildcard $(PATH_DEV)/x86.win32/mingw32/v*.*))
     33  PATH_TOOL_MINGW32 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/mingw32/v*.*))
     34 endif
     35 ifeq ($(PATH_TOOL_MINGW32),)
     36  PATH_TOOL_MINGW32 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/mingw32/v*.*))
    3537 endif
    3638 ifneq ($(PATH_TOOL_MINGW32),)
    37   PATH_TOOL_MINGW32          := $(call lastword,$(PATH_TOOL_MINGW32))
    38  endif
     39  PATH_TOOL_MINGW32 := $(call lastword,$(PATH_TOOL_MINGW32))
     40 endif
     41else
     42 # Resolve any fancy stuff once and for all.
     43 PATH_TOOL_MINGW32 := $(PATH_TOOL_MINGW32)
    3944endif
    4045
    4146# figure out if it's native or needs a win32 launcher
    42 ifneq ($(PATH_TOOL_MINGW32),)
    43 _TOOL_MINGW32_PREFIX            ?= $(PATH_TOOL_MINGW32)/bin/
     47TOOL_MINGW32_HOSTSUFF_EXE ?= $(HOSTSUFF_EXE)
     48ifndef TOOL_MINGW32_PREFIX
     49 ifneq ($(PATH_TOOL_MINGW32),)
     50  TOOL_MINGW32_PREFIX := $(PATH_TOOL_MINGW32)/bin/
     51 else
     52  TOOL_MINGW32_PREFIX :=
     53 endif
     54 ifneq ($(BUILD_PLATFORM),win)
     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)))
     57   TOOL_MINGW32_PREFIX := $(EXEC_X86_WIN32) $(TOOL_MINGW32_PREFIX)
     58   TOOL_MINGW32_HOSTSUFF_EXE := .exe
     59  else
     60   TOOL_MINGW32_PREFIX := $(TOOL_MINGW32_PREFIX)i386-mingw32msvc-
     61   TOOL_MINGW32_HOSTSUFF_EXE :=
     62   TOOL_MINGW32_XCOMPILE := 1
     63  endif
     64 endif
    4465else
    45 _TOOL_MINGW32_PREFIX            ?=
     66 # Resolve any fancy stuff once and for all.
     67 TOOL_MINGW32_PREFIX :=
    4668endif
    47 _TOOL_MINGW32_SUFF_EXE          ?= $(HOSTSUFF_EXE)
    48 ifneq ($(BUILD_PLATFORM),win)
    49  # we're cross compiling either using wine/odin or a cross compiler.
    50  ifneq ($(PATH_TOOL_MINGW32),$(subst x86.win32,,$(PATH_TOOL_MINGW32)))
    51   _TOOL_MINGW32_PREFIX          := $(EXEC_X86_WIN32) $(_TOOL_MINGW32_PREFIX)
    52   _TOOL_MINGW32_SUFF_EXE        ?= .exe
    53  else
    54   _TOOL_MINGW32_PREFIX          := $(_TOOL_MINGW32_PREFIX)i386-mingw32msvc-
    55   _TOOL_MINGW32_SUFF_EXE        ?=
    56   _TOOL_MINGW32_XCOMPILE        ?= 1
    57  endif
     69
     70TOOL_MINGW32_CC  ?= $(TOOL_MINGW32_PREFIX)gcc$(TOOL_MINGW32_HOSTSUFF_EXE)
     71TOOL_MINGW32_CXX ?= $(TOOL_MINGW32_PREFIX)g++$(TOOL_MINGW32_HOSTSUFF_EXE)
     72TOOL_MINGW32_AS  ?= $(TOOL_MINGW32_PREFIX)gcc$(TOOL_MINGW32_HOSTSUFF_EXE)
     73TOOL_MINGW32_AR  ?= $(TOOL_MINGW32_PREFIX)ar$(TOOL_MINGW32_HOSTSUFF_EXE)
     74ifndef TOOL_MINGW32_XCOMPILE# The gentoo package doesn't have g++.
     75TOOL_MINGW32_LD  ?= $(TOOL_MINGW32_PREFIX)g++$(TOOL_MINGW32_HOSTSUFF_EXE)
     76else
     77TOOL_MINGW32_LD  ?= $(TOOL_MINGW32_PREFIX)gcc$(TOOL_MINGW32_HOSTSUFF_EXE)
    5878endif
    59 
    60 TOOL_MINGW32_CC                 ?= $(_TOOL_MINGW32_PREFIX)gcc$(_TOOL_MINGW32_SUFF_EXE)
     79TOOL_MINGW32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     80TOOL_MINGW32_LD_SYSMOD_MAP ?= -Map $(1) --cref
     81TOOL_MINGW32_DLLWRAP ?= $(TOOL_MINGW32_PREFIX)dllwrap$(TOOL_MINGW32_HOSTSUFF_EXE)
     82TOOL_MINGW32_DLLTOOL ?= $(TOOL_MINGW32_PREFIX)dlltool$(TOOL_MINGW32_HOSTSUFF_EXE)
     83
     84# General Properties used by kBuild
    6185TOOL_MINGW32_COBJSUFF           ?= .o
    6286TOOL_MINGW32_CFLAGS             ?= -g
    … …  
    6791TOOL_MINGW32_CDEFS              ?=
    6892
    69 TOOL_MINGW32_CXX                ?= $(_TOOL_MINGW32_PREFIX)g++$(_TOOL_MINGW32_SUFF_EXE)
    7093TOOL_MINGW32_CXXOBJSUFF         ?= .o
    7194TOOL_MINGW32_CXXOBJSUFF         ?= .o
    … …  
    77100TOOL_MINGW32_CXXDEFS            ?=
    78101
    79 TOOL_MINGW32_AS                 ?= $(_TOOL_MINGW32_PREFIX)gcc$(_TOOL_MINGW32_SUFF_EXE)
    80102TOOL_MINGW32_ASFLAGS            ?= -g -x assembler-with-cpp
    81103TOOL_MINGW32_ASOBJSUFF          ?= .o
    82104
    83 TOOL_MINGW32_AR                 ?= $(_TOOL_MINGW32_PREFIX)ar$(_TOOL_MINGW32_SUFF_EXE)
    84105TOOL_MINGW32_ARFLAGS            ?= cr
    85106TOOL_MINGW32_ARLIBSUFF          ?= .a
    86107
    87108# The linux cross compiler ebuild haven't got g++, this is a hack for that.
    88 ifndef _TOOL_MINGW32_XCOMPILE
    89 TOOL_MINGW32_LD                 ?= $(_TOOL_MINGW32_PREFIX)g++$(_TOOL_MINGW32_SUFF_EXE)
    90 else
    91 TOOL_MINGW32_LD                 ?= $(_TOOL_MINGW32_PREFIX)gcc$(_TOOL_MINGW32_SUFF_EXE)
    92 endif
    93109TOOL_MINGW32_LDFLAGS            ?=
    94110TOOL_MINGW32_LDFLAGS.debug      ?= -g
    95111TOOL_MINGW32_LDFLAGS.release    ?= -s
    96 TOOL_MINGW32_LD_MAP             ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    97 TOOL_MINGW32_LD_SYSMOD_MAP      ?= -Map $(1) --cref
    98 
    99 TOOL_MINGW32_DLLWRAP            ?= $(_TOOL_MINGW32_PREFIX)dllwrap$(_TOOL_MINGW32_SUFF_EXE)
    100 TOOL_MINGW32_DLLTOOL            ?= $(_TOOL_MINGW32_PREFIX)dlltool$(_TOOL_MINGW32_SUFF_EXE)
    101112
    102113

  • trunk/kBuild/tools/NASM.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - NASM     0.98 or later.
     4# kBuild Tool Config - Netwide Assembler v0.98+.
    55#
    6 # Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
     6# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    77#
    88#
    … …  
    2525#
    2626
     27TOOL_NASM := Netwide Assembler v0.98+
    2728
    28 TOOL_NASM                     := Netwide Assembler 0.98+
     29# Tool Specific Properties
    2930ifndef PATH_TOOL_NASM
    30  PATH_DEV_BLD                 ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
    31  PATH_TOOL_NASM               := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/nasm/v*.*))
     31 PATH_TOOL_NASM := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/nasm/v*.*))
    3232 ifneq ($(PATH_TOOL_NASM),)
    33   PATH_TOOL_NASM              := $(call lastword,$(PATH_TOOL_NASM))
     33  PATH_TOOL_NASM := $(call lastword,$(PATH_TOOL_NASM))
    3434 endif
     35else
     36 # Resolve any fancy stuff once and for all.
     37 PATH_TOOL_NASM := $(PATH_TOOL_NASM)
    3538endif
    3639
    3740ifneq ($(PATH_TOOL_NASM),)
    38  TOOL_NASM_AS                 ?= $(PATH_TOOL_NASM)/nasm$(HOSTSUFF_EXE)
     41 TOOL_NASM_AS ?= $(PATH_TOOL_NASM)/nasm$(HOSTSUFF_EXE)
    3942else
    40  TOOL_NASM_AS                 ?= nasm$(HOSTSUFF_EXE)
     43 TOOL_NASM_AS ?= nasm$(HOSTSUFF_EXE)
    4144endif
    42 TOOL_NASM_ASFLAGS             ?=
     45
     46# General Properties used by kBuild
     47TOOL_NASM_ASFLAGS ?=
    4348
    4449

  • trunk/kBuild/tools/TAR.kmk

    r665 r667  
    2727TOOL_TAR := tar unpacker.
    2828
    29 TOOL_TAR_UNPACK ?= tar$(HOSTSUFF_EXE)
     29# Tool Specific Properties
     30ifndef 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)
     34 endif
     35else
     36 TOOL_TAR_UNPACK := $(TOOL_TAR_UNPACK)
     37endif
     38
     39# General Properties used by kBuild
    3040TOOL_TAR_UNPACKFLAGS ?=
    3141

  • trunk/kBuild/tools/TARGZ.kmk

    r665 r667  
    2727TOOL_TARGZ := tar.gz unpacker.
    2828
    29 TOOL_TARGZ_UNPACK ?= tar$(HOSTSUFF_EXE)
     29# Tool Specific Properties
     30ifndef 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)
     34 endif
     35else
     36 TOOL_TARGZ_UNPACK := $(TOOL_TARGZ_UNPACK)
     37endif
     38
     39# General Properties used by kBuild
    3040TOOL_TARGZ_UNPACKFLAGS ?= -z
    3141

  • trunk/kBuild/tools/VCC70.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - Visual C++ 7.0 (aka Visual .NET)
     4# kBuild Tool Config - Visual C++ 7.0 (aka Visual Studio .NET), targeting x86.
    55#
    66# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2424#
    2525#
    26 
    27 TOOL_VCC70                    := Visual C++ 7.0
     26           
     27TOOL_VCC70 := Visual C++ 7.0 (aka Visual Studio .NET), targeting x86.
     28
     29# Tool Specific Properties
    2830ifndef PATH_TOOL_VCC70
    29  PATH_TOOL_VCC70              := $(wildcard $(PATH_DEV)/x86.win32/vcc/v7)
     31 PATH_TOOL_VCC70 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v7)
    3032 ifeq ($(PATH_TOOL_VCC70),)
    31   PATH_TOOL_VCC70             := $(PATH_DEV)/x86.win32/vcc70
     33  PATH_TOOL_VCC70 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v7)
    3234 endif
    33 endif
    34 PATH_TOOL_VCC70_LIB           ?= $(PATH_TOOL_VCC70)/lib
    35 PATH_TOOL_VCC70_INC           ?= $(PATH_TOOL_VCC70)/include
    36 PATH_TOOL_VCC70_ATLMFC        ?= $(PATH_TOOL_VCC70)/atlmfc
    37 PATH_TOOL_VCC70_ATLMFC_INC    ?= $(PATH_TOOL_VCC70_ATLMFC)/include
    38 PATH_TOOL_VCC70_ATLMFC_LIB    ?= $(PATH_TOOL_VCC70_ATLMFC)/lib
    39 
    40 TOOL_VCC70_CC                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/cl.exe
    41 TOOL_VCC70_COBJSUFF           ?= .obj
    42 TOOL_VCC70_CFLAGS             ?= -TC -c -nologo
    43 TOOL_VCC70_CFLAGS.debug       ?= -Od -Zi
    44 TOOL_VCC70_CFLAGS.release     ?= -O2
    45 TOOL_VCC70_CFLAGS.profile     ?= -O2
    46 TOOL_VCC70_CINCS              ?= $(PATH_TOOL_VCC70_INC)
    47 TOOL_VCC70_CDEFS              ?=
    48 
    49 TOOL_VCC70_CXX                ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/cl.exe
    50 TOOL_VCC70_CXXOBJSUFF         ?= .obj
    51 TOOL_VCC70_CXXFLAGS           ?= -TP -c -nologo
    52 TOOL_VCC70_CXXFLAGS.debug     ?= -Od -Zi
    53 TOOL_VCC70_CXXFLAGS.release   ?= -O2
    54 TOOL_VCC70_CXXFLAGS.profile   ?= -O2
    55 TOOL_VCC70_CXXINCS            ?= $(PATH_TOOL_VCC70_INC) $(PATH_TOOL_VCC70_ATLMFC_INC)
    56 TOOL_VCC70_CXXDEFS            ?=
    57 
    58 TOOL_VCC70_AS                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/ml.exe
    59 TOOL_VCC70_ASOBJSUFF          ?= .obj
    60 
    61 TOOL_VCC70_RC                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/rc.exe
    62 TOOL_VCC70_RCOBJSUFF          ?= .res
    63 TOOL_VCC70_RCINCS             ?= $(PATH_TOOL_VCC70_INC) $(PATH_TOOL_VCC70_ATLMFC_INC)
    64 
    65 TOOL_VCC70_AR                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/lib.exe
    66 TOOL_VCC70_ARFLAGS            ?= -nologo
    67 TOOL_VCC70_ARLIBSUFF          ?= .lib
    68 
    69 TOOL_VCC70_LD                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70)/bin/link.exe
    70 TOOL_VCC70_LDFLAGS            ?= -nologo
    71 TOOL_VCC70_LDFLAGS.debug      ?= -debug
    72 TOOL_VCC70_LDFLAGS.release    ?=
     35 ifeq ($(PATH_TOOL_VCC70),)
     36  PATH_TOOL_VCC70 := $(PATH_DEVTOOLS)/x86.win32/vcc70
     37 endif
     38 ifneq ($(PATH_TOOL_VCC70),)
     39  # done
     40 else
     41  $(warning kBuild: PATH_TOOL_VCC70 cannot be determined!)
     42  PATH_TOOL_VCC70 := $(PATH_DEVTOOLS)/x86.win/vcc/v7
     43 endif
     44endif
     45PATH_TOOL_VCC70_BIN ?= $(PATH_TOOL_VCC70)/bin
     46PATH_TOOL_VCC70_LIB ?= $(PATH_TOOL_VCC70)/lib
     47PATH_TOOL_VCC70_INC ?= $(PATH_TOOL_VCC70)/include
     48PATH_TOOL_VCC70_ATLMFC ?= $(PATH_TOOL_VCC70)/atlmfc
     49PATH_TOOL_VCC70_ATLMFC_INC ?= $(PATH_TOOL_VCC70_ATLMFC)/include
     50PATH_TOOL_VCC70_ATLMFC_LIB ?= $(PATH_TOOL_VCC70_ATLMFC)/lib
     51TOOL_VCC70_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/cl.exe
     52TOOL_VCC70_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/cl.exe
     53TOOL_VCC70_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/ml.exe
     54TOOL_VCC70_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/rc.exe
     55TOOL_VCC70_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/lib.exe
     56TOOL_VCC70_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC70_BIN)/link.exe
     57VCC70_NEW_DEPS = 1 ##< Enables fast DEP_IDB based dependencies.
    7358
    7459## Constructs the correct .pdb name (the name is lowercased).
    … …  
    7661# @param    $(2)        The extension.
    7762ifeq ($(filter tolower,$(KMK_FEATURES)),tolower)
    78 TOOL_VCC70_PDB                = $(dir $(1))$(tolower $(notdir $(1))).$(2)
     63TOOL_VCC70_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
    7964else # this fallback is incorrect and won't work on a case sensitive FS.
    80 TOOL_VCC70_PDB                = $(1).$(2)
    81 endif
    82 
    83 #ifeq ($(BUILD_PLATFORM),win32)
    84 VCC70_NEW_DEPS = 1
    85 #endif
    86 
     65TOOL_VCC70_PDB = $(1).$(2)
     66endif
     67
     68# General Properties used by kBuild
     69TOOL_VCC70_COBJSUFF         ?= .obj
     70TOOL_VCC70_CFLAGS           ?= -TC -c -nologo
     71TOOL_VCC70_CFLAGS.debug     ?= -Od -Zi
     72TOOL_VCC70_CFLAGS.release   ?= -O2
     73TOOL_VCC70_CFLAGS.profile   ?= -O2
     74TOOL_VCC70_CINCS            ?= $(PATH_TOOL_VCC70_INC)
     75TOOL_VCC70_CDEFS            ?=
     76
     77TOOL_VCC70_CXXOBJSUFF       ?= .obj
     78TOOL_VCC70_CXXFLAGS         ?= -TP -c -nologo
     79TOOL_VCC70_CXXFLAGS.debug   ?= -Od -Zi
     80TOOL_VCC70_CXXFLAGS.release ?= -O2
     81TOOL_VCC70_CXXFLAGS.profile ?= -O2
     82TOOL_VCC70_CXXINCS          ?= $(PATH_TOOL_VCC70_INC) $(PATH_TOOL_VCC70_ATLMFC_INC)
     83TOOL_VCC70_CXXDEFS          ?=
     84
     85TOOL_VCC70_ASOBJSUFF        ?= .obj
     86
     87TOOL_VCC70_RCOBJSUFF        ?= .res
     88TOOL_VCC70_RCINCS           ?= $(PATH_TOOL_VCC70_INC) $(PATH_TOOL_VCC70_ATLMFC_INC)
     89
     90TOOL_VCC70_ARFLAGS          ?= -nologo
     91TOOL_VCC70_ARLIBSUFF        ?= .lib
     92
     93TOOL_VCC70_LDFLAGS          ?= -nologo
     94TOOL_VCC70_LDFLAGS.debug    ?= -debug
     95TOOL_VCC70_LDFLAGS.release  ?=
    8796
    8897
    … …  
    100109# @param    $(outbase)  Output basename (full). Use this for list files and such.
    101110# @param    $(objsuff)  Object suffix.
    102 TOOL_VCC70_COMPILE_C_OUTPUT     = $(call TOOL_VCC70_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC70_PDB, $(outbase)-obj,idb)
    103 TOOL_VCC70_COMPILE_C_DEPEND     =
     111TOOL_VCC70_COMPILE_C_OUTPUT = $(call TOOL_VCC70_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC70_PDB, $(outbase)-obj,idb)
     112TOOL_VCC70_COMPILE_C_DEPEND =
    104113TOOL_VCC70_COMPILE_C_DEPORD =
    105114ifdef VCC70_NEW_DEPS

  • trunk/kBuild/tools/VCC80AMD64.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14)
     4# kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting AMD64.
    55#
    66# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2525#
    2626
    27 
    28 TOOL_VCC80AMD64                    := Visual C++ 8.0 AMD64
    29 PATH_TOOL_VCC80AMD64               ?= $(PATH_DEV)/x86.win32/vcc/v8
    30 PATH_TOOL_VCC80AMD64_LIB           ?= $(PATH_TOOL_VCC80AMD64)/lib
    31 ifeq ($(BUILD_PLATFORM),win64)
    32 PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_TOOL_VCC80AMD64)/bin/amd64
     27TOOL_VCC80AMD64 := Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting AMD64.
     28
     29# Tool Specific Properties
     30ifndef PATH_TOOL_VCC80AMD64
     31 PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/amd64.win/vcc/v8)
     32 ifeq ($(PATH_TOOL_VCC80AMD64),)
     33  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v8)
     34 endif
     35 ifeq ($(PATH_TOOL_VCC80AMD64),)
     36  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8)
     37 endif
     38 ifneq ($(PATH_TOOL_VCC80AMD64),)
     39  # done for now
     40 else
     41  $(warning kBuild: PATH_TOOL_VCC80AMD64 cannot be determined!)
     42  PATH_TOOL_VCC80AMD64 := $(PATH_DEVTOOLS)/x86.win/vcc/v8
     43 endif
    3344else
    34 PATH_TOOL_VCC80AMD64_BIN           ?= $(PATH_TOOL_VCC80AMD64)/bin/x86_amd64
    35 endif
    36 
    37 TOOL_VCC80AMD64_CC                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
    38 TOOL_VCC80AMD64_COBJSUFF           := .obj
    39 TOOL_VCC80AMD64_CFLAGS             := -TC -c -nologo
    40 TOOL_VCC80AMD64_CFLAGS.debug       := -Od -Zi
    41 TOOL_VCC80AMD64_CFLAGS.release     := -O2
    42 TOOL_VCC80AMD64_CFLAGS.profile     := -O2
    43 TOOL_VCC80AMD64_CINCS              := $(PATH_TOOL_VCC80AMD64)/include
    44 TOOL_VCC80AMD64_CDEFS              :=
    45 
    46 TOOL_VCC80AMD64_CXX                := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
    47 TOOL_VCC80AMD64_CXXOBJSUFF         := .obj
    48 TOOL_VCC80AMD64_CXXFLAGS           := -TP -c -nologo
    49 TOOL_VCC80AMD64_CXXFLAGS.debug     := -Od -Zi
    50 TOOL_VCC80AMD64_CXXFLAGS.release   := -O2
    51 TOOL_VCC80AMD64_CXXFLAGS.profile   := -O2
    52 TOOL_VCC80AMD64_CXXINCS            := $(PATH_TOOL_VCC80AMD64)/include
    53 TOOL_VCC80AMD64_CXXDEFS            :=
    54 
    55 TOOL_VCC80AMD64_AS                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/ml64.exe
    56 TOOL_VCC80AMD64_ASOBJSUFF          := .obj
    57 
    58 TOOL_VCC80AMD64_RC                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/../rc.exe
    59 TOOL_VCC80AMD64_RCOBJSUFF          := .res
    60 TOOL_VCC80AMD64_RCINCS             := $(PATH_TOOL_VCC80AMD64)/include
    61 
    62 TOOL_VCC80AMD64_AR                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/lib.exe /MACHINE:X64
    63 TOOL_VCC80AMD64_ARFLAGS            := -nologo
    64 TOOL_VCC80AMD64_ARLIBSUFF          := .lib
    65 
    66 TOOL_VCC80AMD64_LD                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/link.exe
    67 TOOL_VCC80AMD64_LDFLAGS            := -nologo -machine:amd64
    68 TOOL_VCC80AMD64_LDFLAGS.debug      := -debug
    69 TOOL_VCC80AMD64_LDFLAGS.release    :=
    70 
    71 TOOL_VCC80AMD64_MT                 := $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/../mt.exe
    72 
     45 # Resolve any fancy stuff once and for all.
     46 PATH_TOOL_VCC80AMD64 := $(PATH_TOOL_VCC80AMD64)
     47endif
     48ifeq ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH),win.amd64)
     49PATH_TOOL_VCC80AMD64_BIN  ?= $(PATH_TOOL_VCC80AMD64)/bin/amd64
     50else
     51PATH_TOOL_VCC80AMD64_BIN  ?= $(PATH_TOOL_VCC80AMD64)/bin/x86_amd64
     52endif
     53PATH_TOOL_VCC80AMD64_LIB  ?= $(PATH_TOOL_VCC80AMD64)/lib
     54PATH_TOOL_VCC80AMD64_INC  ?= $(PATH_TOOL_VCC80AMD64)/include
     55PATH_TOOL_VCC80AMD64_ATLMFC ?= $(PATH_TOOL_VCC80X86)/atlmfc
     56PATH_TOOL_VCC80AMD64_ATLMFC_INC ?= $(PATH_TOOL_VCC80AMD64_ATLMFC)/include
     57PATH_TOOL_VCC80AMD64_ATLMFC_LIB ?= $(PATH_TOOL_VCC80AMD64_ATLMFC)/lib
     58TOOL_VCC80AMD64_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
     59TOOL_VCC80AMD64_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/cl.exe
     60TOOL_VCC80AMD64_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/ml64.exe
     61TOOL_VCC80AMD64_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/../rc.exe
     62TOOL_VCC80AMD64_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/lib.exe
     63TOOL_VCC80AMD64_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/link.exe
     64TOOL_VCC80AMD64_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80AMD64_BIN)/../mt.exe
     65VCC80AMD64_NEW_DEPS = 1 ##< Enables fast DEP_IDB based dependencies.
    7366
    7467## Constructs the correct .pdb name (the name is lowercased).
    … …  
    7669# @param    $(2)        The extension.
    7770ifeq ($(filter tolower,$(KMK_FEATURES)),tolower)
    78 TOOL_VCC80AMD64_PDB                = $(dir $(1))$(tolower $(notdir $(1))).$(2)
     71TOOL_VCC80AMD64_PDB = $(dir $(1))$(tolower $(notdir $(1))).$(2)
    7972else # this fallback is incorrect and won't work on a case sensitive FS.
    80 TOOL_VCC80AMD64_PDB                = $(1).$(2)
    81 endif
    82 
    83 #ifeq ($(BUILD_PLATFORM),win32)
    84 VCC80AMD64_NEW_DEPS = 1
    85 #endif
     73TOOL_VCC80AMD64_PDB = $(1).$(2)
     74endif
     75
     76TOOL_VCC80AMD64_COBJSUFF         ?= .obj
     77TOOL_VCC80AMD64_CFLAGS           ?= -TC -c -nologo
     78TOOL_VCC80AMD64_CFLAGS.debug     ?= -Od -Zi
     79TOOL_VCC80AMD64_CFLAGS.release   ?= -O2
     80TOOL_VCC80AMD64_CFLAGS.profile   ?= -O2
     81TOOL_VCC80AMD64_CINCS            ?= $(PATH_TOOL_VCC80AMD64_INC)
     82TOOL_VCC80AMD64_CDEFS            ?=
     83
     84TOOL_VCC80AMD64_CXXOBJSUFF       ?= .obj
     85TOOL_VCC80AMD64_CXXFLAGS         ?= -TP -c -nologo
     86TOOL_VCC80AMD64_CXXFLAGS.debug   ?= -Od -Zi
     87TOOL_VCC80AMD64_CXXFLAGS.release ?= -O2
     88TOOL_VCC80AMD64_CXXFLAGS.profile ?= -O2
     89TOOL_VCC80AMD64_CXXINCS          ?= $(PATH_TOOL_VCC80AMD64_INC) $(PATH_TOOL_VCC80AMD64_ATLMFC_INC)
     90TOOL_VCC80AMD64_CXXDEFS          ?=
     91
     92TOOL_VCC80AMD64_ASOBJSUFF        ?= .obj
     93
     94TOOL_VCC80AMD64_RCOBJSUFF        ?= .res
     95TOOL_VCC80AMD64_RCINCS           ?= $(PATH_TOOL_VCC80AMD64_INC) $(PATH_TOOL_VCC80AMD64_ATLMFC_INC)
     96
     97TOOL_VCC80AMD64_ARFLAGS          ?= -nologo -machine:amd64
     98TOOL_VCC80AMD64_ARLIBSUFF        ?= .lib
     99
     100TOOL_VCC80AMD64_LDFLAGS          ?= -nologo -machine:amd64
     101TOOL_VCC80AMD64_LDFLAGS.debug    ?= -debug
     102TOOL_VCC80AMD64_LDFLAGS.release  ?=
    86103
    87104
    … …  
    100117# @param    $(outbase)  Output basename (full). Use this for list files and such.
    101118# @param    $(objsuff)  Object suffix.
    102 TOOL_VCC80AMD64_COMPILE_C_OUTPUT        = $(call TOOL_VCC80AMD64_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC80AMD64_PDB, $(outbase)-obj,idb)
    103 TOOL_VCC80AMD64_COMPILE_C_DEPEND        =
     119TOOL_VCC80AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC80AMD64_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC80AMD64_PDB, $(outbase)-obj,idb)
     120TOOL_VCC80AMD64_COMPILE_C_DEPEND =
    104121TOOL_VCC80AMD64_COMPILE_C_DEPORD =
    105122ifdef VCC80AMD64_NEW_DEPS

  • trunk/kBuild/tools/VCC80X86.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14)
     4# kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting x86.
    55#
    66# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2525#
    2626
    27 
    28 TOOL_VCC80X86                    := Visual C++ 8.0 x86
    29 PATH_TOOL_VCC80X86               ?= $(PATH_DEV)/x86.win32/vcc/v8
    30 PATH_TOOL_VCC80X86_BIN           ?= $(PATH_TOOL_VCC80X86)/bin
    31 PATH_TOOL_VCC80X86_LIB           ?= $(PATH_TOOL_VCC80X86)/lib
    32 PATH_TOOL_VCC80X86_INC           ?= $(PATH_TOOL_VCC80X86)/include
    33 PATH_TOOL_VCC80X86_ATLMFC        ?= $(PATH_TOOL_VCC80X86)/atlmfc
    34 PATH_TOOL_VCC80X86_ATLMFC_INC    ?= $(PATH_TOOL_VCC80X86_ATLMFC)/include
    35 PATH_TOOL_VCC80X86_ATLMFC_LIB    ?= $(PATH_TOOL_VCC80X86_ATLMFC)/lib
    36 
    37 TOOL_VCC80X86_CC                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/cl.exe
    38 TOOL_VCC80X86_COBJSUFF           ?= .obj
    39 TOOL_VCC80X86_CFLAGS             ?= -TC -c -nologo
    40 TOOL_VCC80X86_CFLAGS.debug       ?= -Zi
    41 TOOL_VCC80X86_CFLAGS.release     ?= -O2
    42 TOOL_VCC80X86_CFLAGS.profile     ?= -O2
    43 TOOL_VCC80X86_CINCS              ?= $(PATH_TOOL_VCC80X86_INC)
    44 TOOL_VCC80X86_CDEFS              ?=
    45 
    46 TOOL_VCC80X86_CXX                ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/cl.exe
    47 TOOL_VCC80X86_CXXOBJSUFF         ?= .obj
    48 TOOL_VCC80X86_CXXFLAGS           ?= -TP -c -nologo
    49 TOOL_VCC80X86_CXXFLAGS.debug     ?= -Zi
    50 TOOL_VCC80X86_CXXFLAGS.release   ?= -O2
    51 TOOL_VCC80X86_CXXFLAGS.profile   ?= -O2
    52 TOOL_VCC80X86_CXXINCS            ?= $(PATH_TOOL_VCC80X86_INC) $(PATH_TOOL_VCC80X86_ATLMFC_INC)
    53 TOOL_VCC80X86_CXXDEFS            ?=
    54 
    55 TOOL_VCC80X86_AS                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/ml.exe
    56 TOOL_VCC80X86_ASOBJSUFF          ?= .obj
    57 
    58 TOOL_VCC80X86_RC                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/rc.exe
    59 TOOL_VCC80X86_RCOBJSUFF          ?= .res
    60 TOOL_VCC80X86_RCINCS             ?= $(PATH_TOOL_VCC80X86_INC) $(PATH_TOOL_VCC80X86_ATLMFC_INC)
    61 
    62 TOOL_VCC80X86_AR                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/lib.exe
    63 TOOL_VCC80X86_ARFLAGS            ?= -nologo
    64 TOOL_VCC80X86_ARLIBSUFF          ?= .lib
    65 
    66 TOOL_VCC80X86_LD                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/link.exe
    67 TOOL_VCC80X86_LDFLAGS            ?= -nologo -machine:x86
    68 TOOL_VCC80X86_LDFLAGS.debug      ?= -debug
    69 TOOL_VCC80X86_LDFLAGS.release    ?=
    70 
    71 TOOL_VCC80X86_MT                 ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/mt.exe
     27TOOL_VCC80X86 := Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting x86.
     28
     29# Tool Specific Properties
     30ifndef PATH_TOOL_VCC80X86
     31 PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v8)
     32 ifeq ($(PATH_TOOL_VCC80X86),)
     33  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8)
     34 endif
     35 ifneq ($(PATH_TOOL_VCC80X86),)
     36  # done for now
     37 else
     38  $(warning kBuild: PATH_TOOL_VCC80X86 cannot be determined!)
     39  PATH_TOOL_VCC80X86 := $(PATH_DEVTOOLS)/x86.win/vcc/v8
     40 endif
     41else
     42 # Resolve any fancy stuff once and for all.
     43 PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80X86)
     44endif
     45PATH_TOOL_VCC80X86_BIN    ?= $(PATH_TOOL_VCC80X86)/bin
     46PATH_TOOL_VCC80X86_LIB    ?= $(PATH_TOOL_VCC80X86)/lib
     47PATH_TOOL_VCC80X86_INC    ?= $(PATH_TOOL_VCC80X86)/include
     48PATH_TOOL_VCC80X86_ATLMFC ?= $(PATH_TOOL_VCC80X86)/atlmfc
     49PATH_TOOL_VCC80X86_ATLMFC_INC ?= $(PATH_TOOL_VCC80X86_ATLMFC)/include
     50PATH_TOOL_VCC80X86_ATLMFC_LIB ?= $(PATH_TOOL_VCC80X86_ATLMFC)/lib
     51TOOL_VCC80X86_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/cl.exe
     52TOOL_VCC80X86_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/cl.exe
     53TOOL_VCC80X86_AS  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/ml.exe
     54TOOL_VCC80X86_RC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/rc.exe
     55TOOL_VCC80X86_AR  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/lib.exe
     56TOOL_VCC80X86_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/link.exe
     57TOOL_VCC80X86_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80X86_BIN)/mt.exe
     58VCC80X86_NEW_DEPS = 1 ##< Enables fast DEP_IDB based dependencies.
    7259
    7360## Constructs the correct .pdb name (the name is lowercased).
    … …  
    8168
    8269
    83 #ifeq ($(BUILD_PLATFORM),win32)
    84 VCC80X86_NEW_DEPS = 1
    85 #endif
     70# General Properties used by kBuild
     71TOOL_VCC80X86_COBJSUFF         ?= .obj
     72TOOL_VCC80X86_CFLAGS           ?= -TC -c -nologo
     73TOOL_VCC80X86_CFLAGS.debug     ?= -Zi
     74TOOL_VCC80X86_CFLAGS.release   ?= -O2
     75TOOL_VCC80X86_CFLAGS.profile   ?= -O2
     76TOOL_VCC80X86_CINCS            ?= $(PATH_TOOL_VCC80X86_INC)
     77TOOL_VCC80X86_CDEFS            ?=
     78
     79TOOL_VCC80X86_CXXOBJSUFF       ?= .obj
     80TOOL_VCC80X86_CXXFLAGS         ?= -TP -c -nologo
     81TOOL_VCC80X86_CXXFLAGS.debug   ?= -Zi
     82TOOL_VCC80X86_CXXFLAGS.release ?= -O2
     83TOOL_VCC80X86_CXXFLAGS.profile ?= -O2
     84TOOL_VCC80X86_CXXINCS          ?= $(PATH_TOOL_VCC80X86_INC) $(PATH_TOOL_VCC80X86_ATLMFC_INC)
     85TOOL_VCC80X86_CXXDEFS          ?=
     86
     87TOOL_VCC80X86_ASOBJSUFF        ?= .obj
     88
     89TOOL_VCC80X86_RCOBJSUFF        ?= .res
     90TOOL_VCC80X86_RCINCS           ?= $(PATH_TOOL_VCC80X86_INC) $(PATH_TOOL_VCC80X86_ATLMFC_INC)
     91
     92TOOL_VCC80X86_ARFLAGS          ?= -nologo
     93TOOL_VCC80X86_ARLIBSUFF        ?= .lib
     94
     95TOOL_VCC80X86_LDFLAGS          ?= -nologo -machine:x86
     96TOOL_VCC80X86_LDFLAGS.debug    ?= -debug
     97TOOL_VCC80X86_LDFLAGS.release  ?=
    8698
    8799
    … …  
    100112# @param    $(outbase)  Output basename (full). Use this for list files and such.
    101113# @param    $(objsuff)  Object suffix.
    102 TOOL_VCC80X86_COMPILE_C_OUTPUT  = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC80X86_PDB, $(outbase)-obj,idb)
    103 TOOL_VCC80X86_COMPILE_C_DEPEND  =
     114TOOL_VCC80X86_COMPILE_C_OUTPUT = $(call TOOL_VCC80X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC80X86_PDB, $(outbase)-obj,idb)
     115TOOL_VCC80X86_COMPILE_C_DEPEND =
    104116TOOL_VCC80X86_COMPILE_C_DEPORD =
    105117ifdef VCC80X86_NEW_DEPS
    … …  
    168180endif
    169181
     182## @todo configure the assembler template.
    170183
    171184## Compile resource source.

  • trunk/kBuild/tools/WGET.kmk

    r665 r667  
    2727TOOL_WGET := wget fetcher.
    2828
    29 TOOL_WGET_FETCH ?= wget$(HOSTSUFF_EXE)
     29# Tool Specific Properties
     30ifndef TOOL_WGET_FETCH
     31 TOOL_WGET_FETCH := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/wget$(HOSTSUFF_EXE))
     32 ifeq ($(TOOL_WGET_FETCH),)
     33  TOOL_WGET_FETCH := wget$(HOSTSUFF_EXE)
     34 endif
     35else
     36 # Resolve any fancy stuff once and for all.
     37 TOOL_WGET_FETCH := $(TOOL_WGET_FETCH)
     38endif
     39
     40# General Properties used by kBuild
    3041TOOL_WGET_FETCHFLAGS ?= --passive-ftp -t 5 -T 60
    3142

  • trunk/kBuild/tools/XGCCAMD64LINUX.kmk

    r665 r667  
    22## @file
    33#
    4 # kBuild Tool Config - GCC Cross compiler for AMD64 (aka x86_64).
     4# kBuild Tool Config - GCC Cross compiler for AMD64+Linux.
    55#
    66# Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_XGCCAMD64LINUX                    := GCC Cross Compiler for AMD64
    28 
    29 #
    30 # Determin some stuff dynamically.
    31 #
    32 _TOOL_XGCCAMD64LINUX_EXEC_PREFIX       ?=
    33 _TOOL_XGCCAMD64LINUX_SUFF_EXE          ?=
     27TOOL_XGCCAMD64LINUX := GCC Cross compiler for AMD64+Linux.
     28
     29# Tool Specific Properties
     30TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE ?= $(HOSTSUFF_EXE)
    3431ifeq ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH),linux.amd64)
    35  # not x-compile.
    36  PATH_TOOL_XGCCAMD64LINUX              ?=
    37  _TOOL_XGCCAMD64LINUX_PREFIX           ?=
     32 # not x-compile, use the default gcc.
     33 TOOL_XGCCAMD64LINUX_PREFIX := $(TOOL_XGCCAMD64LINUX_PREFIX)
    3834else # x-compile:
    3935 # find the latest xgcc build.
    40  _TOOL_XGCCAMD64LINUX_PREFIX           ?= x86_64-unknown-linux-gnu-
    41  ifndef PATH_TOOL_XGCCAMD64LINUX
    42   PATH_DEV_BLD                         ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
    43   PATH_TOOL_XGCCAMD64LINUX             := $(sort $(wildcard $(PATH_DEV_BLD)/x86_64-unknown-linux-gnu/*))
    44   ifeq ($(filter-out win.amd64,$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),) # these can use the windows build.
    45    _TOOL_XGCCAMD64LINUX_EXEC_PREFIX    := $(EXEC_X86_WIN32)
    46    PATH_TOOL_XGCCAMD64LINUX            := $(sort $(wildcard $(PATH_DEV)/x86.win32/x86_64-unknown-linux-gnu/*))
     36 ifdef TOOL_XGCCAMD64LINUX_PREFIX
     37  TOOL_XGCCAMD64LINUX_PREFIX := x86_64-unknown-linux-gnu-
     38  ifndef PATH_TOOL_XGCCAMD64LINUX
     39   PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/x86_64-unknown-linux-gnu/*))
     40   ifeq ($(PATH_TOOL_XGCCAMD64LINUX),)
     41    ifeq ($(filter-out win.amd64,$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),) # these can use the windows build.
     42     TOOL_XGCCAMD64LINUX_EXEC_PREFIX ?= $(EXEC_X86_WIN32)
     43     TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE := .exe
     44     PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/x86_64-unknown-linux-gnu/*))
     45     ifeq ($(PATH_TOOL_XGCCAMD64LINUX),)
     46      PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/x86_64-unknown-linux-gnu/*))
     47     endif
     48    endif
     49   endif
     50   ifneq ($(PATH_TOOL_XGCCAMD64LINUX),)
     51    PATH_TOOL_XGCCAMD64LINUX := $(call lastword,$(PATH_TOOL_XGCCAMD64LINUX))
     52   endif
     53  endif # !PATH_TOOL_XGCCAMD64LINUX
     54  ifneq ($(PATH_TOOL_XGCCAMD64LINUX),)
     55   TOOL_XGCCAMD64LINUX_PREFIX := $(TOOL_XGCCAMD64LINUX_EXEC_PREFIX) $(PATH_TOOL_XGCCAMD64LINUX)/bin/$(TOOL_XGCCAMD64LINUX_PREFIX)
    4756  endif
    48   ifneq ($(PATH_TOOL_XGCCAMD64LINUX),)
    49    PATH_TOOL_XGCCAMD64LINUX            := $(call lastword,$(PATH_TOOL_XGCCAMD64LINUX))
    50   endif
    51  endif # !PATH_TOOL_XGCCAMD64LINUX
     57 else
     58  # Resolve any fancy stuff once and for all.
     59  TOOL_XGCCAMD64LINUX_PREFIX := $(TOOL_XGCCAMD64LINUX_PREFIX)
     60 endif
    5261endif
    53 ifneq ($(PATH_TOOL_XGCCAMD64LINUX),)
    54 _TOOL_XGCCAMD64LINUX_PREFIX            := $(_TOOL_XGCCAMD64LINUX_EXEC_PREFIX) $(PATH_TOOL_XGCCAMD64LINUX)/bin/$(_TOOL_XGCCAMD64LINUX_PREFIX)
    55 endif
    56 
    57 
    58 TOOL_XGCCAMD64LINUX_CC                 ?= $(_TOOL_XGCCAMD64LINUX_PREFIX)gcc$(HOSTSUFF_EXE)
    59 TOOL_XGCCAMD64LINUX_COBJSUFF           ?= .o
    60 TOOL_XGCCAMD64LINUX_CFLAGS             ?= -g
    61 TOOL_XGCCAMD64LINUX_CFLAGS.debug       ?= -O0
    62 TOOL_XGCCAMD64LINUX_CFLAGS.release     ?= -O2
    63 TOOL_XGCCAMD64LINUX_CFLAGS.profile     ?= -O2 #-pg
    64 TOOL_XGCCAMD64LINUX_CINCS              ?=
    65 TOOL_XGCCAMD64LINUX_CDEFS              ?=
    66 
    67 TOOL_XGCCAMD64LINUX_CXX                ?= $(_TOOL_XGCCAMD64LINUX_PREFIX)g++$(HOSTSUFF_EXE)
    68 TOOL_XGCCAMD64LINUX_CXXOBJSUFF         ?= .o
    69 TOOL_XGCCAMD64LINUX_CXXOBJSUFF         ?= .o
    70 TOOL_XGCCAMD64LINUX_CXXFLAGS           ?= -g
    71 TOOL_XGCCAMD64LINUX_CXXFLAGS.debug     ?= -O0
    72 TOOL_XGCCAMD64LINUX_CXXFLAGS.release   ?= -O2
    73 TOOL_XGCCAMD64LINUX_CXXFLAGS.profile   ?= -O2 #-pg
    74 TOOL_XGCCAMD64LINUX_CXXINCS            ?=
    75 TOOL_XGCCAMD64LINUX_CXXDEFS            ?=
    76 
    77 TOOL_XGCCAMD64LINUX_AS                 ?= $(_TOOL_XGCCAMD64LINUX_PREFIX)gcc$(HOSTSUFF_EXE)
    78 TOOL_XGCCAMD64LINUX_ASFLAGS            ?= -g -x assembler-with-cpp
    79 TOOL_XGCCAMD64LINUX_ASOBJSUFF          ?= .o
    80 
    81 TOOL_XGCCAMD64LINUX_AR                 ?= $(_TOOL_XGCCAMD64LINUX_PREFIX)ar$(HOSTSUFF_EXE)
    82 TOOL_XGCCAMD64LINUX_ARFLAGS            ?= cr
    83 TOOL_XGCCAMD64LINUX_ARLIBSUFF          ?= .a
    84 
    85 TOOL_XGCCAMD64LINUX_LD                 ?= $(_TOOL_XGCCAMD64LINUX_PREFIX)g++$(HOSTSUFF_EXE)
    86 TOOL_XGCCAMD64LINUX_LD_SYSMOD          ?= $(_TOOL_XGCCAMD64LINUX_PREFIX)ld$(HOSTSUFF_EXE)
    87 TOOL_XGCCAMD64LINUX_LDFLAGS            ?=
    88 TOOL_XGCCAMD64LINUX_LDFLAGS.debug      ?= -g
    89 TOOL_XGCCAMD64LINUX_LDFLAGS.release    ?= -s
    90 ifndef TOOL_XGCCAMD64LINUX_LDFLAGS.$(BUILD_TARGET)
    91 TOOL_XGCCAMD64LINUX_LDFLAGS.dll        ?= -shared
    92 else
    93 TOOL_XGCCAMD64LINUX_LDFLAGS.dll        ?= $(TOOL_XGCCAMD64LINUX_LDFLAGS.$(BUILD_TARGET))
    94 endif
    95 TOOL_XGCCAMD64LINUX_LDFLAGS.sysmod     ?= -r
    96 TOOL_XGCCAMD64LINUX_LD_SONAME          ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    97 ifeq ($(BUILD_TARGET),os2)
    98 TOOL_XGCCAMD64LINUX_LD_MAP             ?= -Zmap=$(1)
    99 else
    100 TOOL_XGCCAMD64LINUX_LD_MAP             ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    101 endif
    102 ifeq ($(BUILD_TARGET),os2)
    103 TOOL_XGCCAMD64LINUX_LD_SYSMOD_MAP      ?= -Zmap=$(1)
    104 else
    105 TOOL_XGCCAMD64LINUX_LD_SYSMOD_MAP      ?= -Map $(1) --cref
    106 endif
     62
     63TOOL_XGCCAMD64LINUX_CC  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)gcc$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
     64TOOL_XGCCAMD64LINUX_CXX ?= $(TOOL_XGCCAMD64LINUX_PREFIX)g++$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
     65TOOL_XGCCAMD64LINUX_AS  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)gcc$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
     66TOOL_XGCCAMD64LINUX_AR  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)ar$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
     67TOOL_XGCCAMD64LINUX_LD  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)g++$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
     68TOOL_XGCCAMD64LINUX_LD_SYSMOD ?= $(TOOL_XGCCAMD64LINUX_PREFIX)ld$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
     69
     70TOOL_XGCCAMD64LINUX_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     71TOOL_XGCCAMD64LINUX_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     72TOOL_XGCCAMD64LINUX_LD_SYSMOD_MAP ?= -Map $(1) --cref
     73TOOL_XGCCAMD64LINUX_LDFLAGS.dll ?= -shared
     74TOOL_XGCCAMD64LINUX_LDFLAGS.sysmod ?= -r
     75
    10776ifdef SLKRUNS
    10877TOOL_XGCCAMD64LINUX_CC  += -fmessage-length=0
    10978TOOL_XGCCAMD64LINUX_CXX += -fmessage-length=0
    11079endif
     80
     81# General Properties used by kBuild
     82TOOL_XGCCAMD64LINUX_COBJSUFF         ?= .o
     83TOOL_XGCCAMD64LINUX_CFLAGS           ?= -g
     84TOOL_XGCCAMD64LINUX_CFLAGS.debug     ?= -O0
     85TOOL_XGCCAMD64LINUX_CFLAGS.release   ?= -O2
     86TOOL_XGCCAMD64LINUX_CFLAGS.profile   ?= -O2 #-pg
     87TOOL_XGCCAMD64LINUX_CINCS            ?=
     88TOOL_XGCCAMD64LINUX_CDEFS            ?=
     89
     90TOOL_XGCCAMD64LINUX_CXXOBJSUFF       ?= .o
     91TOOL_XGCCAMD64LINUX_CXXOBJSUFF       ?= .o
     92TOOL_XGCCAMD64LINUX_CXXFLAGS         ?= -g
     93TOOL_XGCCAMD64LINUX_CXXFLAGS.debug   ?= -O0
     94TOOL_XGCCAMD64LINUX_CXXFLAGS.release ?= -O2
     95TOOL_XGCCAMD64LINUX_CXXFLAGS.profile ?= -O2 #-pg
     96TOOL_XGCCAMD64LINUX_CXXINCS          ?=
     97TOOL_XGCCAMD64LINUX_CXXDEFS          ?=
     98
     99TOOL_XGCCAMD64LINUX_ASFLAGS          ?= -g -x assembler-with-cpp
     100TOOL_XGCCAMD64LINUX_ASOBJSUFF        ?= .o
     101
     102TOOL_XGCCAMD64LINUX_ARFLAGS          ?= cr
     103TOOL_XGCCAMD64LINUX_ARLIBSUFF        ?= .a
     104
     105TOOL_XGCCAMD64LINUX_LDFLAGS          ?=
     106TOOL_XGCCAMD64LINUX_LDFLAGS.debug    ?= -g
     107TOOL_XGCCAMD64LINUX_LDFLAGS.release  ?= -s
     108
    111109
    112110

  • trunk/kBuild/tools/YASM.kmk

    r665 r667  
    2525#
    2626
     27TOOL_YASM := YASM v0.4.0+
    2728
    28 TOOL_YASM                     := Yasm, the modular assembler v0.4.0+
     29# Tool Specific Properties
    2930ifndef PATH_TOOL_YASM
    30 PATH_DEV_BLD                  ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
    31 PATH_TOOL_YASM                := $(sort $(wildcard $(PATH_DEV_BLD)/yasm/v*.*))
     31 PATH_TOOL_YASM := $(sort $(wildcard $(PATH_DEVTOOL_BLD)/yasm/v*.*))
     32 ifneq ($(PATH_TOOL_YASM),)
     33  PATH_TOOL_YASM := $(call lastword,$(PATH_TOOL_YASM))
     34 endif
     35else
     36 # Resolve any fancy stuff once and for all.
     37 PATH_TOOL_YASM := $(PATH_TOOL_YASM)
     38endif
    3239ifneq ($(PATH_TOOL_YASM),)
    33 PATH_TOOL_YASM                := $(call lastword,$(PATH_TOOL_YASM))
    34 endif
     40 TOOL_YASM_AS ?= $(PATH_TOOL_YASM)/yasm$(HOSTSUFF_EXE)
     41else
     42 TOOL_YASM_AS ?= yasm$(HOSTSUFF_EXE)
    3543endif
    3644
    37 ifneq ($(PATH_TOOL_YASM),)
    38 TOOL_YASM_AS                  ?= $(PATH_TOOL_YASM)/yasm$(HOSTSUFF_EXE)
    39 else
    40 TOOL_YASM_AS                  ?= yasm$(HOSTSUFF_EXE)
    41 endif
    42 TOOL_YASM_ASFLAGS             ?=
     45# General Properties used by kBuild
     46TOOL_YASM_ASFLAGS ?=
    4347
    4448
Note: See TracChangeset for help on using the changeset viewer.