Revision 1111

trunk/scripts/admb/adlink (revision 1111)
40 40
  fi 
41 41
done
42 42

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

  
51 49
LDFLAGS="$LDFLAGS"
trunk/scripts/admb/adcomp (revision 1111)
31 31
  file=$file.cpp
32 32
fi
33 33

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

  
42 40
CXXFLAGS="-c $CXXFLAGS $sym"
trunk/src/GNUmakefile (revision 1111)
14 14
ifeq ($(TERMINAL),dos)
15 15
  DISK=..\build\dist
16 16
  LIBPATH=..\build\objects\dist
17
  CXXFLAGS_INCLUDES:=-I..\${DISK}\include
18 17
  PWD=$(shell cd)
19 18
  PATH:=$(PATH);..\utilities\mingw\bin;..\utilities
20 19
else
21 20
  DISK=../build/dist
22 21
  LIBPATH=../build/objects/dist
23
  CXXFLAGS_INCLUDES:=-I../${DISK}/include
24 22
  PWD=$(shell pwd)
25 23
endif
26 24

  
27
CXXFLAGS:=$(CXXFLAGS) -D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE
25
ifdef DEBUG
26
CXXFLAGS_PRE:=-g
27
else
28
CXXFLAGS_PRE:=-O3
29
endif
28 30

  
29 31
ifdef BUILD_SHARED_LIBRARY
30
CXXFLAGS:=-fPIC $(CXXFLAGS)
32
CXXFLAGS_PRE:=$(CXXFLAGS_PRE) -fPIC
31 33
endif
32 34

  
33 35
ifneq ($(CXX),CC)
34
CXXFLAGS:=-Wall $(CXXFLAGS)
36
CXXFLAGS_PRE:=$(CXXFLAGS_PRE) -Wall
35 37
endif
36 38

  
37
ifdef DEBUG
38
CXXFLAGS:=-g $(CXXFLAGS)
39
CXXFLAGS_DEFINES:=-D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE
40

  
41
ifeq ($(TERMINAL),dos)
42
CXXFLAGS_INCLUDES:=-I..\build\dist\include
43
CXXFLAGS_INCLUDES_CONTRIB:=-I..\..\build\dist\include
39 44
else
40
CXXFLAGS:=-O3 $(CXXFLAGS)
45
CXXFLAGS_INCLUDES:=-I../build/dist/include
46
CXXFLAGS_INCLUDES_CONTRIB:=-I../../build/dist/include
41 47
endif
42 48

  
43
CXXFLAGS_CONTRIB:=$(CXXFLAGS)
44

  
45
ifeq ($(TERMINAL),dos)
46
CXXFLAGS:=$(CXXFLAGS) -I..\build\dist\include
49
ifdef CXXFLAGS
50
CXXFLAGS_OPT:=$(CXXFLAGS_PRE) $(CXXFLAGS) -DOPT_LIB $(CXXFLAGS_DEFINES) $(CXXFLAGS_INCLUDES)
51
CXXFLAGS_SAFE:=$(CXXFLAGS_PRE) $(CXXFLAGS) -DSAFE_ALL $(CXXFLAGS_DEFINES) $(CXXFLAGS_INCLUDES)
52
CXXFLAGS_OPT_CONTRIB:=$(CXXFLAGS_PRE) $(CXXFLAGS) -DOPT_LIB $(CXXFLAGS_DEFINES) $(CXXFLAGS_INCLUDES_CONTRIB)
53
CXXFLAGS_SAFE_CONTRIB:=$(CXXFLAGS_PRE) $(CXXFLAGS) -DSAFE_ALL $(CXXFLAGS_DEFINES) $(CXXFLAGS_INCLUDES_CONTRIB)
47 54
else
48
CXXFLAGS:=$(CXXFLAGS) -I../build/dist/include
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff