Revision 1128

trunk/scripts/admb/adlink.bat (revision 1128)
32 32
if %linker%==g++ (set out=-o %model%) else (set def=-def %model%.def^
33 33
 --driver-name g++ & set out=--output-lib lib%model%.a -o %model%.dll)
34 34

  
35
set CMD=%linker% %sym% -static %def% -o %model%.exe %objects% %libs%
35
call "%ADMB_HOME%"\bin\admb-cfg.bat
36
if defined LDFLAGS (
37
  set LDFLAGS=%LDFLAGS% %ADMB_CFG_LDFLAGS%
38
) else (
39
  set LDFLAGS=%ADMB_CFG_LDFLAGS%
40
)
41

  
42
set CMD=%linker% %LDFLAGS% %sym% -static %def% -o %model%.exe %objects% %libs%
36 43
echo %CMD%
37 44
%CMD%
38 45

  
trunk/scripts/admb/adcomp.bat (revision 1128)
21 21
:ENDLOOP
22 22

  
23 23
set model=%~n1
24
if defined CXXFLAGS (set CXXFLAGS=%CXXFLAGS% )
25 24

  
25
call "%ADMB_HOME%"\bin\admb-cfg.bat
26
if defined CXXFLAGS (
27
  set CXXFLAGS=%CXXFLAGS% %ADMB_CFG_CXXFLAGS%
28
) else (
29
  set CXXFLAGS=%ADMB_CFG_CXXFLAGS%
30
)
31

  
26 32
set CMD=g++ -c %CXXFLAGS% %sym% -D__GNUDOS__ %dll% -Dlinux %opt% -DUSE_LAPLACE -fpermissive -I. -I"%ADMB_HOME%\include" -I"%ADMB_HOME%\contrib\include" -o %model%.obj %model%.cpp
27 33
echo %CMD%
28 34
%CMD%
trunk/src/GNUmakefile (revision 1128)
354 354
	if not exist ${DISK}\bin md ${DISK}\bin
355 355
	copy df1b2-separable\seddf1b* ${DISK}\bin
356 356
	copy df1b2-separable\sedf1b2* ${DISK}\bin
357
	if exist ${DISK}\bin\admb-cfg.sh del ${DISK}\bin\admb-cfg.sh
358
	echo "CXX=$(CXX)" > ${DISK}\bin\admb-cfg.sh
359
	echo "CXXFLAGS=$(CXXFLAGS)" >> ${DISK}\bin\admb-cfg.sh
357
	if exist ${DISK}\bin\admb-cfg.bat del ${DISK}\bin\admb-cfg.bat
358
	echo set ADMB_CFG_CXX=$(CXX) > ${DISK}\bin\admb-cfg.bat
359
	echo set ADMB_CFG_CXXFLAGS=$(CXXFLAGS) >> ${DISK}\bin\admb-cfg.bat
360 360
  ifeq ($(OS),Windows_NT)
361
	echo "LDFLAGS=-static $(LDFLAGS)" >> ${DISK}\bin\admb-cfg.sh
361
	echo set ADMB_CFG_LDFLAGS=-static $(LDFLAGS) >> ${DISK}\bin\admb-cfg.bat
362 362
  else
363
	echo "LDFLAGS=$(LDFLAGS)" >> ${DISK}\bin\admb-cfg.sh
363
	echo set ADMB_CFG_LDFLAGS=$(LDFLAGS) >> ${DISK}\bin\admb-cfg.bat
364 364
  endif
365 365
	$(MAKE) --directory=df1b2-separable CC=$(CC) DISKDIR=..\${DISK} bins
366 366
	$(MAKE) --directory=nh99 CC=$(CC) DISKDIR=..\${DISK} bins

Also available in: Unified diff