Revision 1357

trunk/src/GNUmakefile (revision 1357)
25 25
endif
26 26

  
27 27
ifdef DEBUG
28
CXXFLAGS_PRE:=-g
28
  CXXFLAGS_PRE:=-g
29 29
else
30 30
  ifeq ($(CXX),openCC)
31 31
    CXXFLAGS_PRE:=-O2
......
122 122
	@echo For installation, check README.txt.
123 123

  
124 124
shared: objects
125
	g++ -shared -o${DISK}/lib/libadmb.so ../build/objects/dist/saflp-linad99-*.obj ../build/objects/dist/saflp-df1b2-separable-*.obj ../build/objects/dist/optlp-nh99-*.obj ../build/objects/dist/optlp-tools99-*.obj ../build/objects/dist/saflp-contrib-*.obj
126
	g++ -shared -o${DISK}/lib/libadmbo.so ../build/objects/dist/optlp-*.obj
127
	$(MAKE) CXXFLAGS="$(CXXFLAGS)" ADMB_HOME="$(PWD)/${DISK}" --directory=../contrib build-ad2csv
125
	$(CXX) -shared -o${DISK}/lib/libadmb.so ../build/objects/dist/saflp-*.obj
126
	$(CXX) -shared -o${DISK}/lib/libadmbo.so ../build/objects/dist/optlp-*.obj
127
	$(MAKE) CXXFLAGS="$(CXXFLAGS)" --directory=../contrib build-ad2csv
128 128
	@echo ADMB shared build completed.
129 129
	@echo For installation, check README.txt.
130 130

  
......
355 355
	copy df1b2-separable\seddf1b* ${DISK}\bin
356 356
	copy df1b2-separable\sedf1b2* ${DISK}\bin
357 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
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 set ADMB_CFG_LDFLAGS=-static $(LDFLAGS) >> ${DISK}\bin\admb-cfg.bat
361
	echo set ADMB_CFG_LDFLAGS=$(LDFLAGS)>>${DISK}\bin\admb-cfg.bat
362 362
  else
363
	echo set ADMB_CFG_LDFLAGS=$(LDFLAGS) >> ${DISK}\bin\admb-cfg.bat
363
	echo set ADMB_CFG_LDFLAGS=$(LDFLAGS)>>${DISK}\bin\admb-cfg.bat
364 364
  endif
365 365
  ifdef MINGW_HOME
366
	echo set MINGW_HOME=$MINGW_HOME >> ${DISK}\bin\admb-cfg.bat
366
	echo set MINGW_HOME=$(MINGW_HOME)>>${DISK}\bin\admb-cfg.bat
367 367
  endif
368 368
	$(MAKE) --directory=df1b2-separable CC=$(CC) DISKDIR=..\${DISK} bins
369 369
	$(MAKE) --directory=nh99 CC=$(CC) DISKDIR=..\${DISK} bins
......
388 388
	cp ../scripts/admb/adlink ${DISK}/bin
389 389
  endif
390 390
	rm -f ${DISK}/bin/admb-cfg.sh
391
	echo "ADMB_CFG_CXX=$(CXX)" > ${DISK}/bin/admb-cfg.sh
392
	echo "ADMB_CFG_CXXFLAGS=$(CXXFLAGS)" >> ${DISK}/bin/admb-cfg.sh
391
	echo "ADMB_CFG_CXX=$(CXX)">${DISK}/bin/admb-cfg.sh
392
	echo "ADMB_CFG_CXXFLAGS=$(CXXFLAGS)">>${DISK}/bin/admb-cfg.sh
393 393
  ifeq ($(OS),Windows_NT)
394
	echo "ADMB_CFG_LDFLAGS=-static $(LDFLAGS)" >> ${DISK}/bin/admb-cfg.sh
394
	echo "ADMB_CFG_LDFLAGS=-static $(LDFLAGS)">>${DISK}/bin/admb-cfg.sh
395 395
  else
396
	echo "ADMB_CFG_LDFLAGS=$(LDFLAGS)" >> ${DISK}/bin/admb-cfg.sh
396
	echo "ADMB_CFG_LDFLAGS=$(LDFLAGS)">>${DISK}/bin/admb-cfg.sh
397 397
  endif
398 398
	$(MAKE) --directory=df1b2-separable CC=$(CC) DISKDIR=../${DISK} bins
399 399
	$(MAKE) --directory=nh99 CC=$(CC) DISKDIR=../${DISK} bins

Also available in: Unified diff