Changeset 520 for trunk/Config.kmk


Ignore:
Timestamp:
Mar 16, 2016, 8:14:59 PM (5 years ago)
Author:
Matthias Waltenberger
Message:

Various build conf changes for GCC 4.9.2 (incl Steven's patch), #266 use shared library for poppler

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:ignore
      •  

        old new  
        22LocalConfig.kmk
        33LocalEnv.cmd
         4
         5.project
         6
         7.cproject
         8
         9.settings
  • trunk/Config.kmk

    r519 r520  
    4242# poppler
    4343#
    44 LIB_POPPLER_LIBS        =  $(patsubst %,$(PATH_STAGE_LIB)/%$(SUFF_LIB), \
    45         fofi goo poppler splash fontconfig freetype2 jpeg)
     44#LIB_POPPLER_LIBS       =  $(patsubst %,$(PATH_STAGE_LIB)/%$(SUFF_LIB), \
     45#       fofi goo poppler splash fontconfig freetype2 jpeg)
    4646
    4747#------------------------------------------------------------------------------
     
    9595#
    9696
    97 TOOL_GXX3OMF_RC                                 ?= rc$(HOSTSUFF_EXE)
     97# 2016-03-10 SHL
     98override TOOL_GXX3OMF_RC                                        ?= rc$(HOSTSUFF_EXE)
    9899TOOL_GXX3OMF_RCOBJSUFF                  ?= .res
    99100
     
    104105TOOL_GXX3OMF_COMPILE_RC_OUTPUT   =
    105106TOOL_GXX3OMF_COMPILE_RC_OUTPUT_MAYBE     =
    106 define TOOL_GXX3OMF_COMPILE_RC_CMDS
     107# 2016-03-05 SHL
     108override define TOOL_GXX3OMF_COMPILE_RC_CMDS
    107109        $(QUIET)cd $(subst /,\\,$(patsubst %/,%,$(dir $(source)))) && \
    108110                $(TOOL_GXX3OMF_RC) -n -r \
     
    146148endef
    147149
    148 TOOL_GCC3OMF_RC                                 ?= $(TOOL_GXX3OMF_RC)
     150# 2016-03-10 SHL
     151override TOOL_GCC3OMF_RC                                        ?= $(TOOL_GXX3OMF_RC)
    149152TOOL_GCC3OMF_RCOBJSUFF                  ?= $(TOOL_GXX3OMF_RCOBJSUFF)
    150153
     
    155158TOOL_GCC3OMF_COMPILE_RC_OUTPUT                   = $(TOOL_GXX3OMF_COMPILE_RC_OUTPUT)
    156159TOOL_GCC3OMF_COMPILE_RC_OUTPUT_MAYBE     = $(TOOL_GXX3OMF_COMPILE_RC_OUTPUT_MAYBE)
    157 TOOL_GCC3OMF_COMPILE_RC_CMDS                     = $(TOOL_GXX3OMF_COMPILE_RC_CMDS)
     160# 2016-03-10 SHL
     161override TOOL_GCC3OMF_COMPILE_RC_CMDS                    = $(TOOL_GXX3OMF_COMPILE_RC_CMDS)
    158162
    159163override define TOOL_GCC3OMF_LINK_DLL_CMDS
     
    436440INSTALL := $(PATH_ROOT)/tools/install.cmd
    437441
     442
Note: See TracChangeset for help on using the changeset viewer.