Changeset 549


Ignore:
Timestamp:
Sep 9, 2016, 9:13:47 PM (4 years ago)
Author:
Gregg Young
Message:

Changes to build system to get sym, xqs and the English help file built with kbuild

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r524 r549  
    4949#------------------------------------------------------------------------------
    5050
     51KBUILD_UNIT_PATHS          += $(PATH_ROOT)
     52
    5153#
    5254# Lucide C Compiler template
    5355#
    5456TEMPLATE_LucideC                         = Lucide C Compiler
     57TEMPLATE_LucideC_USES            = Extra
    5558TEMPLATE_LucideC_TOOL            = GCC3OMF
    5659TEMPLATE_LucideC_CFLAGS          =
     
    6164#
    6265# Lucide C++ Compiler template
    63 #
     66# 
    6467TEMPLATE_LucideCxx                       = Lucide C++ Compiler
     68TEMPLATE_LucideCxx_USES          = Extra
    6569TEMPLATE_LucideCxx_TOOL          = GXX3OMF
    6670TEMPLATE_LucideCxx_CXXFLAGS      =
     
    96100
    97101# 2016-03-10 SHL
    98 override TOOL_GXX3OMF_RC                                        ?= rc$(HOSTSUFF_EXE)
     102override INST_DLL                       = bin/
     103override TOOL_GXX3OMF_RCFLAGS           =
     104override TOOL_GXX3OMF_RC                                        ?= wrc$(HOSTSUFF_EXE)
    99105TOOL_GXX3OMF_RCOBJSUFF                  ?= .res
    100106
    101107TOOL_GXX3OMF_EXEPACK                    ?= lxlite /B- /L- /CS
    102 TOOL_GXX3OMF_MAPSYM             ?= runmapsym.cmd wmapsym.cmd   
    103 TOOL_GXX3OMF_MAPXQS             ?= mapxqs.exe  $(outbase).map -o $(outbase).xqs
    104108TOOL_GXX3OMF_COMPILE_RC_DEPEND   =
    105109TOOL_GXX3OMF_COMPILE_RC_DEPORD   =
    106110TOOL_GXX3OMF_COMPILE_RC_OUTPUT   =
    107111TOOL_GXX3OMF_COMPILE_RC_OUTPUT_MAYBE     =
     112
     113# Added to build the help files 2016-09-04 GKY
     114override define TOOL__LINK_MISCBIN_CMDS 
     115                $(QUIET)wipfc.exe $(Lucide_en.hlp_SOURCES)
     116endef   
    108117# 2016-03-05 SHL
    109118override define TOOL_GXX3OMF_COMPILE_RC_CMDS
    110119        $(QUIET)cd $(subst /,\\,$(patsubst %/,%,$(dir $(source)))) && \
    111                 $(TOOL_GXX3OMF_RC) -r \
     120                $(TOOL_GXX3OMF_RC) -r\
    112121                $(flags) \
    113                 $(addprefix -i ,$(incs) $(subst ;, ,$(C_INCLUDE_PATH))) \
    114                 $(addprefix -D ,$(defs)) \
    115122                $(source) $(obj)
    116123endef
    117124
    118 override define TOOL_GXX3OMF_LINK_DLL_CMDS
     125define TOOL_GXX3OMF_LINK_DLL_CMDS
    119126        $(QUIET)$(APPEND) $(outbase).rsp\
    120127                $(TOOL_GXX3OMF_LDFLAGS.dll)\
     
    131138        $(if $(filter-out debug,$(BUILD_TYPE)), \
    132139                -$(QUIET)$(TOOL_GXX3OMF_EXEPACK) $(out))
    133                 $(QUIET)$(TOOL_GXX3OMF_MAPSYM) $(outbase).map $(outbase).sym
    134                 $(QUIET)$(TOOL_GXX3OMF_MAPXQS)
    135140endef
    136141
     
    149154        $(if $(filter-out debug,$(BUILD_TYPE)), \
    150155                -$(QUIET)$(TOOL_GXX3OMF_EXEPACK) $(out))
    151                 $(QUIET)$(TOOL_GXX3OMF_MAPSYM) $(outbase).map $(outbase).sym
    152                 $(QUIET)$(TOOL_GXX3OMF_MAPXQS)
    153156endef
    154157
    155158# 2016-03-10 SHL
     159override TOOL_GCC3OMF_RCFLAGS           ?= $(TOOL_GXX3OMF_RCFLAGS)
    156160override TOOL_GCC3OMF_RC                                        = $(TOOL_GXX3OMF_RC)
    157161TOOL_GCC3OMF_RCOBJSUFF                  ?= $(TOOL_GXX3OMF_RCOBJSUFF)
    158162
    159163TOOL_GCC3OMF_EXEPACK                    ?= $(TOOL_GXX3OMF_EXEPACK)
    160 TOOL_GCC3OMF_MAPSYM                     ?= $(TOOL_GXX3OMF_MAPSYM)
    161 TOOL_GCC3OMF_MAPXQS                     ?= $(TOOL_GXX3OMF_MAPXQS)
    162164TOOL_GCC3OMF_COMPILE_RC_DEPEND                   = $(TOOL_GXX3OMF_COMPILE_RC_DEPEND)
    163165TOOL_GCC3OMF_COMPILE_RC_DEPORD                   = $(TOOL_GXX3OMF_COMPILE_RC_DEPORD)
     
    182184        $(if $(filter-out debug,$(BUILD_TYPE)), \
    183185                -$(QUIET)$(TOOL_GCC3OMF_EXEPACK) $(out))
    184                 $(QUIET)$(TOOL_GCC3OMF_MAPSYM) $(outbase).map  $(outbase).sym
    185                 $(QUIET)$(TOOL_GCC3OMF_MAPXQS)
    186 endef
    187 
    188 override define TOOL_GCC3OMF_LINK_PROGRAM_CMDS
     186endef
     187
     188define TOOL_GCC3OMF_LINK_PROGRAM_CMDS
    189189        $(QUIET)$(APPEND) $(outbase).rsp\
    190190                $(flags)\
     
    200200        $(if $(filter-out debug,$(BUILD_TYPE)), \
    201201                -$(QUIET)$(TOOL_GCC3OMF_EXEPACK) $(out)) 
    202                 $(QUIET)$(TOOL_GCC3OMF_MAPSYM) $(outbase).map $(outbase).sym
    203                 $(QUIET)$(TOOL_GCC3OMF_MAPXQS)
    204202endef
    205203
     
    450448INSTALL := $(PATH_ROOT)/tools/install.cmd
    451449
    452 
  • trunk/Lucide/Makefile.kmk

    r496 r549  
    1515#
    1616INSTALLS += Lucide_doc
     17MISCBINS += Lucide_en.hlp
    1718
    1819#
     
    2425        $(wildcard $(PATH_SUB_CURRENT)/LICENSE.*) \
    2526        gui/bitmaps/Lucide.ico
    26 
     27       
     28#
     29# Lucide Help File
     30#
     31#Lucide_help_INST          = $(PATH_STAGE)\bin
     32Lucide_en.hlp_SOURCES     = $(PATH_ROOT)\lucide\lng\lucide_en.ipf \
     33                            -o $(PATH_OBJ)\lucide_en.hlp\Lucide_en.hlp
     34       
    2735include $(FILE_KBUILD_SUB_FOOTER)
    2836
  • trunk/env.cmd

    r496 r549  
    6363call EnvSet 'PATH_LIB_CURL_INCS', translate(G.PATH_LIB_CURL_INCS, '/', '\')
    6464call EnvSet 'PATH_LIB_CURL_LIBPATH', translate(G.PATH_LIB_CURL_LIBPATH, '/', '\')
     65
     66/* setup variables for help file bitmap location */
     67call EnvSet 'IPFCARTWORK', translate( directory()'/Lucide/gui/bitmaps', '/', '\')
    6568
    6669/* setup OpenWatcom (not necessary any more) */
Note: See TracChangeset for help on using the changeset viewer.