Revision 1926

trunk/scripts/admb/admb.bat (revision 1926)
150 150
      set libs="!ADMB_HOME!\contrib\lib\contribo.lib" "!ADMB_HOME!\lib\admbo.lib" /link
151 151
    )
152 152
  ) else (
153
    set CXXFLAGS=!CXXFLAGS! /DSAFE_ALL
154 153
    if not exist !ADMB_HOME!\contrib\lib\contrib.lib (
155 154
      set libs="!ADMB_HOME!\lib\admb.lib" /link
156 155
    ) else (
......
204 203
      set libs=!ADMB_HOME!\contrib\lib\libcontribo.a !ADMB_HOME!\lib\libadmbo.a
205 204
    )
206 205
  ) else (
207
    set CXXFLAGS=!CXXFLAGS! -DSAFE_ALL
208 206
    if not exist !ADMB_HOME!\contrib\lib\libcontrib.a (
209 207
      set libs=!ADMB_HOME!\lib\libadmb.a
210 208
    ) else (
trunk/scripts/admb/admb (revision 1926)
150 150
fi
151 151
if [ "$library" == "opt" ]; then
152 152
  CXXFLAGS="$CXXFLAGS -DOPT_LIB"
153
else
154
  CXXFLAGS="$CXXFLAGS -DSAFE_ALL"
155 153
fi
156 154
if [ ! -f "$ADMB_HOME/contrib/lib/libcontrib.a" ]; then
157
  CXXFLAGS="$CXXFLAGS -Dlinux -DUSE_LAPLACE -I. -I\"$ADMB_HOME/include\" -I\"$ADMB_HOME/include/contrib\""
155
  CXXFLAGS="$CXXFLAGS -DUSE_LAPLACE -I. -I\"$ADMB_HOME/include\" -I\"$ADMB_HOME/include/contrib\""
158 156
else
159
  CXXFLAGS="$CXXFLAGS -Dlinux -DUSE_LAPLACE -I. -I\"$ADMB_HOME/include\" -I\"$ADMB_HOME/contrib/include\""
157
  CXXFLAGS="$CXXFLAGS -DUSE_LAPLACE -I. -I\"$ADMB_HOME/include\" -I\"$ADMB_HOME/contrib/include\""
160 158
fi
161 159
if [ "$CXX" == "adcomp-x86_64-w64-mingw32" ]; then
162 160
  LDFLAGS="--static $LDFLAGS"
trunk/src/GNUmakefile (revision 1926)
63 63
ADCXXFLAGS:= -Wall -Wextra -Wno-unused-parameter $(ADCXXFLAGS)
64 64
endif
65 65

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

  
68 69
ifeq ($(SHELL),cmd)
69 70
ADCXXFLAGS:= $(ADCXXFLAGS) -I..\build\dist\include
......
73 74

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

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

  
78 79
include df1b2-separable/objects.lst
79 80
OBJECTS=$(addprefix optlp-df1b2-separable-,$(OBJ0)) $(addprefix saflp-df1b2-separable-,$(OBJ0))
trunk/src/Makefile (revision 1926)
4 4
OBJDESTDIR=..\build\objects\dist
5 5
LEXDESTDIR=..\build\lex
6 6

  
7
#SAFE_ALL= /DSAFE_ALL
8

  
7 9
!IF DEFINED(DEBUG)
8
CXXFLAGS_SAF=/nologo /W4 /wd4100 /wd4239 /GF /EHsc /DSAFE_ALL /DUSE_LAPLACE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /I$(DESTDIR)\include
10
CXXFLAGS_SAF=/nologo /W4 /wd4100 /wd4239 /GF /EHsc$(SAFE_ALL)/DUSE_LAPLACE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /I$(DESTDIR)\include
9 11
CXXFLAGS_OPT=/nologo /W4 /wd4100 /wd4239 /GF /EHsc /DOPT_LIB  /DUSE_LAPLACE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /I$(DESTDIR)\include
10 12
!ELSE
11
CXXFLAGS_SAF=/nologo /O2 /W4 /wd4100 /wd4239 /GF /EHsc /DSAFE_ALL /DUSE_LAPLACE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /I$(DESTDIR)\include
13
CXXFLAGS_SAF=/nologo /O2 /W4 /wd4100 /wd4239 /GF /EHsc$(SAFE_ALL) /DUSE_LAPLACE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /I$(DESTDIR)\include
12 14
CXXFLAGS_OPT=/nologo /O2 /W4 /wd4100 /wd4239 /GF /EHsc /DOPT_LIB  /DUSE_LAPLACE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /I$(DESTDIR)\include
13 15
!ENDIF
14 16

  

Also available in: Unified diff