Changeset 20546

Show
Ignore:
Timestamp:
07/14/07 21:27:05 (1 year ago)
Author:
aronb
Message:

Change back to MIN_GMTL_VERSION. This matches up with the unix build.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/build_windows.py

    r20545 r20546  
    800800   snx_subst_vars['snx_libs'] = '' 
    801801   snx_subst_vars['VPR_VERSION'] = vpr_module.getVersion('.') 
    802    snx_subst_vars['GMTL_VERSION'] = '.'.join(getGMTLVersion()) 
     802   snx_subst_vars['MIN_GMTL_VERSION'] = '.'.join(getGMTLVersion()) 
    803803   snx_module = JugglerModule(r'modules\sonix', vcDir, 'Sonix', 'SNX_VERSION', 
    804804                              snx_subst_vars, 
    …… 
    818818   gadget_subst_vars['VPR_VERSION'] = jccl_subst_vars['VPR_VERSION'] 
    819819   gadget_subst_vars['JCCL_VERSION'] = jccl_module.getVersion('.') 
    820    gadget_subst_vars['GMTL_VERSION'] = snx_subst_vars['GMTL_VERSION'] 
     820   gadget_subst_vars['MIN_GMTL_VERSION'] = snx_subst_vars['GMTL_VERSION'] 
    821821   gadget_module = JugglerModule(r'modules\gadgeteer', vcDir, 'Gadgeteer', 
    822822                                 'GADGET_VERSION', gadget_subst_vars, 

  • juggler/trunk/modules/gadgeteer/gadgeteer.fpc.in

    r20544 r20546  
    5454Version: ${gadget_version} 
    5555Provides: gadgeteer 
    56 Requires: jccl = @JCCL_VERSION@ vpr = @VPR_VERSION@ gmtl >= @GMTL_VERSION@ 
     56Requires: jccl = @JCCL_VERSION@ vpr = @VPR_VERSION@ gmtl >= @MIN_GMTL_VERSION@ 
    5757Arch: ${ISA} 
    5858Cflags: ${gadget_cxxflags} ${gadget_extra_cxxflags} -I${includedir} 

  • juggler/trunk/modules/sonix/sonix.fpc.in

    r20544 r20546  
    4848Version: ${snx_version} 
    4949Provides: sonix 
    50 Requires: vpr = @VPR_VERSION@ gmtl >= @GMTL_VERSION@ 
     50Requires: vpr = @VPR_VERSION@ gmtl >= @MIN_GMTL_VERSION@ 
    5151Arch: ${ISA} 
    5252Cflags: ${snx_cxxflags} ${snx_extra_cxxflags} -I${includedir}