There was a bug in the program API for pkgconfig, where you fed in
some include dirs and files, and pkgconfig added more based on 
resource requirements.

However in flx/flx_run.flx these were assigned back to the input
variables so the list expanded with each call, which occurs when
using the regex option of flx.

INCLUDE_DIRS and INCLUDE_FILES are now dropped from the input 
to map_package_requirements in lib/std/felix/flx_pkg.

instead, you add these values in the result to your standard values:

proc calpackages 
{
  var x = FlxPkg::map_package_requirements 
  (
     FLX_INSTALL_DIR = config.FLX_INSTALL_DIR,
     EXT_EXE = config.EXT_EXE,
     EXT_STATIC_OBJ = config.EXT_STATIC_OBJ,
     STATIC = control.STATIC,
     SLINK_STRING = control.SLINK_STRING,
     DLINK_STRING = control.DLINK_STRING,
     LINKER_SWITCHES = control.LINKER_SWITCHES,
     cpp_filebase = dvars.cpp_filebase
  );
  control.INCLUDE_DIRS += x.INCLUDE_DIRS;
  control.INCLUDE_FILES += x.INCLUDE_FILES;
  control.DRIVER_EXE = x.DRIVER_EXE;
  control.DRIVER_OBJS = x.DRIVER_OBJS;
  control.LINK_STRING = x.LINK_STRING;

--
john skaller
skal...@users.sourceforge.net
http://felix-lang.org




------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester  
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the  
endpoint security space. For insight on selecting the right partner to 
tackle endpoint security challenges, access the full report. 
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Felix-language mailing list
Felix-language@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/felix-language

Reply via email to