Revision 1193

branches/threaded2merge/src/GNUmakefile (revision 1193)
37 37
  endif
38 38
endif
39 39

  
40
ifeq ($(CXX),CC)
41
CXXFLAGS_PRE:=$(CXXFLAGS_PRE) -mt
42
else
40 43
CXXFLAGS_PRE:=$(CXXFLAGS_PRE) -pthread
44
endif
41 45

  
42 46
ifdef BUILD_SHARED_LIBRARY
43 47
CXXFLAGS_PRE:=$(CXXFLAGS_PRE) -fPIC
......
384 388
  endif
385 389
	rm -f ${DISK}/bin/admb-cfg.sh
386 390
	echo "ADMB_CFG_CXX=$(CXX)" > ${DISK}/bin/admb-cfg.sh
391
  ifeq ($(CXX),CC)
392
	echo "ADMB_CFG_CXXFLAGS=\"-mt $(CXXFLAGS)\"" >> ${DISK}/bin/admb-cfg.sh
393
  else
387 394
	echo "ADMB_CFG_CXXFLAGS=\"-pthread $(CXXFLAGS)\"" >> ${DISK}/bin/admb-cfg.sh
395
  endif
388 396
  ifeq ($(OS),Windows_NT)
389 397
	echo "ADMB_CFG_LDFLAGS=\"-static $(LDFLAGS)\"" >> ${DISK}/bin/admb-cfg.sh
390 398
  else
399
    ifeq ($(CXX),CC)
400
	echo "ADMB_CFG_LDFLAGS=\"-mt $(LDFLAGS)\"" >> ${DISK}/bin/admb-cfg.sh
401
    else
391 402
	echo "ADMB_CFG_LDFLAGS=\"-pthread $(LDFLAGS)\"" >> ${DISK}/bin/admb-cfg.sh
403
    endif
392 404
  endif
393 405
	$(MAKE) --directory=df1b2-separable CC=$(CC) DISKDIR=../${DISK} bins
394 406
	$(MAKE) --directory=nh99 CC=$(CC) DISKDIR=../${DISK} bins

Also available in: Unified diff