Revision 1424

trunk/scripts/admb/admb.bat (revision 1424)
23 23
    ) else (
24 24
      set ADMB_PATH="%%~dpa"
25 25
    )
26
    pushd !ADMB_PATH!\..
26
    pushd !ADMB_PATH!
27
    pushd ..
27 28
    set ADMB_HOME=!CD!
28 29
    popd
30
    popd
29 31
  )
32
) else (
33
  pushd !ADMB_HOME!
34
  set ADMB_HOME=!CD!
35
  popd
30 36
)
37

  
31 38
if not defined ADMB_HOME (
32 39
  echo "Error: ADMB_HOME is not defined."
33 40
  goto EOF
......
109 116
) else (
110 117
  set LDFLAGS= -static
111 118
)
112
if exist !ADMB_HOME!bin\admb-cfg.bat (
113
  call !ADMB_HOME!bin\admb-cfg.bat
119
if exist !ADMB_HOME!\bin\admb-cfg.bat (
120
  call !ADMB_HOME!\bin\admb-cfg.bat
114 121
  if defined ADMB_CFG_CXXFLAGS (
115 122
    set CXXFLAGS=!CXXFLAGS! !ADMB_CFG_CXXFLAGS!
116 123
  )
......
144 151
)
145 152
if defined fast (
146 153
  set CXXFLAGS=!CXXFLAGS! -DOPT_LIB
147
  set libs=!ADMB_HOME!contrib\lib\libcontribo.a !ADMB_HOME!lib\libadmbo.a
154
  set libs=!ADMB_HOME!\contrib\lib\libcontribo.a !ADMB_HOME!\lib\libadmbo.a
148 155
) else (
149 156
  set CXXFLAGS=!CXXFLAGS! -DSAFE_ALL
150
  set libs=!ADMB_HOME!contrib\lib\libcontrib.a !ADMB_HOME!lib\libadmb.a
157
  set libs=!ADMB_HOME!\contrib\lib\libcontrib.a !ADMB_HOME!\lib\libadmb.a
151 158
)
152 159
if defined d (
153 160
  set CXXFLAGS=!CXXFLAGS! -DBUILDING_DLL
154 161
)
155
set CXXFLAGS=!CXXFLAGS! -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -fpermissive -I. -I!ADMB_HOME!include -I!ADMB_HOME!contrib\include
162
set CXXFLAGS=!CXXFLAGS! -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -fpermissive -I. -I!ADMB_HOME!\include -I!ADMB_HOME!\contrib\include
156 163
if defined MINGW_HOME (
157
  set PATH=!ADMB_HOME!bin;!MINGW_HOME!\bin;!PATH!
164
  set PATH=!ADMB_HOME!\bin;!MINGW_HOME!\bin;!PATH!
158 165
) else (
159
  set PATH=!ADMB_HOME!bin;!ADMB_HOME!utilities\mingw\bin;!PATH!
166
  set PATH=!ADMB_HOME!\bin;!ADMB_HOME!\utilities\mingw\bin;!PATH!
160 167
)
161 168
if not defined tpls (
162 169
  if not defined srcs (
trunk/src/GNUmakefile (revision 1424)
213 213
	echo "ADMB_CFG_CXXFLAGS=\"$(USER_CXXFLAGS)\"">>${DIST}/bin/admb-cfg.sh
214 214
  ifeq ($(OS),Windows_NT)
215 215
	echo "ADMB_CFG_LDFLAGS=\"-static $(USER_LDFLAGS)\"">>${DIST}/bin/admb-cfg.sh
216
	cp ../utilities/sed.exe ${DIST}/bin
217
	cp ../utilities/libiconv2.dll ${DIST}/bin
218
	cp ../utilities/libintl3.dll ${DIST}/bin
219
	cp ../utilities/regex2.dll ${DIST}/bin
220 216
	cp ../scripts/admb/admb ${DIST}/bin/admb.sh
221 217
	cp ../scripts/admb/root-admb ../admb.sh
222 218
	cp ../scripts/admb/root-admb ${DIST}/admb.sh
......
424 420
	@rm -vf ../admb
425 421
	@rm -vf ../admb.bat
426 422
	@rm -vf ../admb.cmd
423
	@rm -vf ../admb.sh
427 424
	@rm -vf ../admb.zip
428 425
	@rm -vf ../REVISION
429 426
	@rm -vf nh99/lex.yy.c

Also available in: Unified diff