Revision 1935

trunk/scripts/admb/admb (revision 1935)
152 152
  CXXFLAGS="$CXXFLAGS -DOPT_LIB"
153 153
fi
154 154
if [ ! -f "$ADMB_HOME/contrib/lib/libcontrib.a" ]; then
155
  CXXFLAGS="$CXXFLAGS -DUSE_LAPLACE -I. -I\"$ADMB_HOME/include\" -I\"$ADMB_HOME/include/contrib\""
155
  CXXFLAGS="$CXXFLAGS -I. -I\"$ADMB_HOME/include\" -I\"$ADMB_HOME/include/contrib\""
156 156
else
157
  CXXFLAGS="$CXXFLAGS -DUSE_LAPLACE -I. -I\"$ADMB_HOME/include\" -I\"$ADMB_HOME/contrib/include\""
157
  CXXFLAGS="$CXXFLAGS -I. -I\"$ADMB_HOME/include\" -I\"$ADMB_HOME/contrib/include\""
158 158
fi
159 159
if [ "$CXX" == "adcomp-x86_64-w64-mingw32" ]; then
160 160
  LDFLAGS="--static $LDFLAGS"
trunk/scripts/admb/admb.bat (revision 1935)
157 157
    )
158 158
  )
159 159
  if not exist !ADMB_HOME!\contrib\lib\contrib.lib (
160
    set CXXFLAGS=!CXXFLAGS! /DUSE_LAPLACE /I. /I"!ADMB_HOME!\include" /I"!ADMB_HOME!\include\contrib"
160
    set CXXFLAGS=!CXXFLAGS! /I. /I"!ADMB_HOME!\include" /I"!ADMB_HOME!\include\contrib"
161 161
  ) else (
162
    set CXXFLAGS=!CXXFLAGS! /DUSE_LAPLACE /I. /I"!ADMB_HOME!\include" /I"!ADMB_HOME!\contrib\include"
162
    set CXXFLAGS=!CXXFLAGS! /I. /I"!ADMB_HOME!\include" /I"!ADMB_HOME!\contrib\include"
163 163
  )
164 164
) else (
165 165
  if not defined CXX (
......
213 213
    set CXXFLAGS=!CXXFLAGS! -DBUILDING_DLL
214 214
  )
215 215
  if not exist !ADMB_HOME!\contrib\lib\libcontrib.a (
216
    set CXXFLAGS=!CXXFLAGS! -DUSE_LAPLACE -fpermissive -I. -I!ADMB_HOME!\include -I!ADMB_HOME!\include\contrib
216
    set CXXFLAGS=!CXXFLAGS! -fpermissive -I. -I!ADMB_HOME!\include -I!ADMB_HOME!\include\contrib
217 217
  ) else (
218
    set CXXFLAGS=!CXXFLAGS! -DUSE_LAPLACE -fpermissive -I. -I!ADMB_HOME!\include -I!ADMB_HOME!\contrib\include
218
    set CXXFLAGS=!CXXFLAGS! -fpermissive -I. -I!ADMB_HOME!\include -I!ADMB_HOME!\contrib\include
219 219
  )
220 220
)
221 221
set PATH=!ADMB_HOME!\bin;!ADMB_HOME!\utilities\mingw\bin;!PATH!
trunk/src/GNUmakefile (revision 1935)
64 64
endif
65 65

  
66 66
#ADCXXFLAGS:=$(strip $(ADCXXFLAGS)) -DSAFE_ALL
67
ADCXXFLAGS:=$(strip $(ADCXXFLAGS)) -DUSE_LAPLACE
68 67

  
69 68
ifeq ($(SHELL),cmd)
70
ADCXXFLAGS:= $(ADCXXFLAGS) -I..\build\dist\include
69
ADCXXFLAGS:=$(strip $(ADCXXFLAGS)) -I..\build\dist\include
71 70
else
72
ADCXXFLAGS:= $(ADCXXFLAGS) -I../build/dist/include
71
ADCXXFLAGS:=$(strip $(ADCXXFLAGS)) -I../build/dist/include
73 72
endif
74 73

  
75 74
override CXXFLAGS += $(ADCXXFLAGS)
76 75

  
77
CXXFLAGS_OPT_LIB:=$(subst -DUSE_LAPLACE,-DOPT_LIB -DUSE_LAPLACE,$(CXXFLAGS))
76
CXXFLAGS_OPT_LIB:=$(subst -I,-DOPT_LIB -I,$(CXXFLAGS))
78 77

  
79 78
include df1b2-separable/objects.lst
80 79
OBJECTS=$(addprefix optlp-df1b2-separable-,$(OBJ0)) $(addprefix saflp-df1b2-separable-,$(OBJ0))
trunk/src/nh99/getbigs.cpp (revision 1935)
8 8
 * \file
9 9
 * Description not yet available.
10 10
 */
11
#if defined(USE_LAPLACE)
12 11
#  include <df1b2fun.h>
13
#endif
14 12
#include <admodel.h>
15 13

  
16 14
/**
......
35 33
    ad_exit(1);
36 34
  }
37 35

  
38
#if defined(USE_LAPLACE)
39 36
    int us=nvar1-nvar;
40 37
    int xsize = 0, usize = 0;
41 38
    dmatrix minv(1,us,1,us);
......
201 198
        BS(i,j)=Suu(i-xsize,j-xsize);
202 199
      }
203 200
    }
204
#   endif
205

  
206

  
207 201
 //
208 202
 //   int us=nvar1-nvar;
209 203
 //   int xsize,usize;
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff