Changeset 406:4724d2329f4d in finroc


Ignore:
Timestamp:
03.04.2020 14:00:50 (11 months ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Parents:
404:5b5753c59074 (diff), 405:eace819fb2ed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge with 17.03

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • etc/sources.list

    r395 r406  
    1 http://finroc.org 17.03 main 
     1http://finroc.org development main 
  • scripts/tools/configure

    r395 r406  
    165165# additional configuration 
    166166$configuration{"restrict-components"} = "no" unless defined $configuration{"restrict-components"}; 
    167 $configuration{"make_builder_flags"} = [ "--report-unmanaged-files", "--soversion=17.03" ]; 
     167$configuration{"make_builder_flags"} = [ "--report-unmanaged-files" ]; 
    168168push @{$configuration{"make_builder_flags"}}, "--local-libs-only" if $configuration{"restrict-components"} eq "yes"; 
    169169$configuration{"architecture"} = $architecture; 
Note: See TracChangeset for help on using the changeset viewer.