Skip to content

Commit

Permalink
Config update for new building mode
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuszslabicki committed Apr 10, 2021
1 parent f21dc3b commit 4830c2a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .oppbuildspec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<buildspec version="4.0">
<dir path="." type="custom"/>
<dir makemake-options="--deep -o flora -O out -I. --meta:recurse --meta:export-include-path --meta:use-exported-include-paths --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
<dir makemake-options="--make-so --deep -o flora -O out -I. --meta:recurse --meta:export-include-path --meta:use-exported-include-paths --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
</buildspec>
4 changes: 2 additions & 2 deletions simulations/run_example_networks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ FILES=examples/*
for f in $FILES
do
echo "Started network $f:"
../src/run_flora -u Cmdenv -f $f
done
$(dirname $0)/../src/run_flora -u Cmdenv -f $f
done
5 changes: 2 additions & 3 deletions src/run_flora
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/bin/bash
if [ "$INET_ROOT" = "" ]; then
echo "INET version not selected. Please run 'source setenv' in the root folder of the INET installation you want to use."
exit 1
INET_ROOT=$(dirname $0)/../../inet4.3
fi

PATH=$INET_ROOT/src:$PATH

opp_run -l ../src/flora -n .:../src:$INET_ROOT/src "$@"
opp_run -l ../src/flora -n .:../src:$INET_ROOT/src "$@"

0 comments on commit 4830c2a

Please sign in to comment.