Revision 1114

trunk/scripts/admb/adlink (revision 1114)
11 11
if [[ "$1" == "-help" ]]; then help; exit; fi
12 12
if [[ "$1" == "--help" ]]; then help; exit; fi
13 13

  
14
if [ -f "$ADMB_HOME/bin/admb-cfg.sh" ]; then
15
  source "$ADMB_HOME/bin/admb-cfg.sh"
16
else
17
  CXX=c++
18
fi
19

  
20
if [ "$CXX" == "openCC" ]; then
21
  sym=-O2
22
else
23
  sym=-O3
24
fi
25

  
14 26
unset shared
15
sym=
16 27
opt=
17 28
while getopts "dgrso" A; do
18 29
  case $A in
19 30
    d) shared=-shared;;
20
    g) unset sym;;
31
    g) sym=-g;;
21 32
    r) ;;
22 33
    s) ;;
23 34
    o) opt=o;;
......
25 36
done
26 37
shift $((OPTIND-1))
27 38

  
28
if [[ "`uname -s`" == "Darwin" ]]; then unset sym; fi
39
#if [[ "`uname -s`" == "Darwin" ]]; then unset sym; fi
29 40

  
30 41
model="${1%.*}"
31 42

  
......
40 51
  fi 
41 52
done
42 53

  
43
if [ -f "$ADMB_HOME/bin/admb-cfg.sh" ]; then
44
  source "$ADMB_HOME/bin/admb-cfg.sh"
45
else
46
  CXX=c++
47
fi
48

  
49 54
LDFLAGS="$LDFLAGS"
50 55
if [ ! -z "$sym" ]; then
51 56
  LDFLAGS="$LDFLAGS $sym"
trunk/scripts/admb/adcomp (revision 1114)
11 11
if [[ "$1" == "-help" ]]; then help; exit; fi
12 12
if [[ "$1" == "--help" ]]; then help; exit; fi
13 13

  
14
if [ -f "$ADMB_HOME/bin/admb-cfg.sh" ]; then
15
  source "$ADMB_HOME/bin/admb-cfg.sh"
16
else
17
  CXX=c++
18
fi
19

  
20
if [ "$CXX" == "openCC" ]; then
21
  sym=-O2
22
else
23
  sym=-O3
24
fi
25

  
14 26
# Pop args until model=$1
15 27
unset dll
16 28
opt=-DSAFE_ALL
17
sym=-O3
18 29
while getopts "dgrs" A; do
19 30
  case $A in
20 31
    d) dll=-DBUILDING_DLL;;
......
31 42
  file=$file.cpp
32 43
fi
33 44

  
34
if [ -f "$ADMB_HOME/bin/admb-cfg.sh" ]; then
35
  source "$ADMB_HOME/bin/admb-cfg.sh"
36
else
37
  CXX=c++
38
fi
39 45

  
40 46
CXXFLAGS="-c $CXXFLAGS $sym"
41 47
if [ ! -z "$dll" ]; then
trunk/src/GNUmakefile (revision 1114)
25 25
ifdef DEBUG
26 26
CXXFLAGS_PRE:=-g
27 27
else
28
CXXFLAGS_PRE:=-O3
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff