Revision 1331 trunk/src/GNUmakefile

GNUmakefile (revision 1331)
3 3
INSTALL_DIR=/usr/local/
4 4

  
5 5
ifeq ($(OS),Windows_NT)
6
  ifdef TERM
7
    ifeq ("$(TERM)","xterm")
8
      TERMINAL=cygwin
9
    endif
10
    ifeq ("$(TERM)","cygwin")
11
      TERMINAL=cygwin
12
    endif
13
  else
6
  ifndef TERM
14 7
    TERMINAL=dos
15 8
    SHELL=cmd
16 9
  endif
......
231 224

  
232 225
ifeq ($(TERMINAL),dos)
233 226
..\build\objects\dist\optlp-nh99-banner.obj: nh99\banner.cpp
234
	$(CXX) -c $(CXXFLAGS_OPT) -DADMB_VERSION=$(shell cat ../VERSION) -DADMB_REVISION=$(shell test -f ../REVISION && cat ../REVISION) -o$@ $<
227
	$(CXX) -c $(CXXFLAGS_OPT) -DADMB_VERSION=$(shell if exist ..\VERSION type ..\VERSION) -DADMB_REVISION=$(shell if exist ..\REVISION type ..\REVISION) -o$@ $<
235 228

  
236 229
..\build\objects\dist\saflp-nh99-banner.obj: nh99\banner.cpp
237
	$(CXX) -c $(CXXFLAGS_SAFE) -DADMB_VERSION=$(shell cat ../VERSION) -DADMB_REVISION=$(shell test -f ../REVISION && cat ../REVISION) -o$@ $<
230
	$(CXX) -c $(CXXFLAGS_SAFE) -DADMB_VERSION=$(shell if exist ..\VERSION type ..\VERSION) -DADMB_REVISION=$(shell if exist ..\REVISION type ..\REVISION) -o$@ $<
238 231

  
239 232
..\build\objects\dist\optlp-sparse-hs_sparse.obj: sparse\hs_sparse.cpp
240 233
	$(CXX) -c $(CXXFLAGS_OPT) -o$@ $<
......
428 421

  
429 422
verify:
430 423
ifeq ($(TERMINAL),dos)
431
	$(MAKE) FAST_OPTION=-f -C $(DISK)\examples --file=Makefile all
424
	$(MAKE) SHELL=cmd FAST_OPTION=-f -C $(DISK)\examples --file=Makefile all
432 425
	pushd ..\build\dist & ..\..\scripts\get-outputs.bat > "..\..\benchmarks-opt.txt" & popd
433
	$(MAKE) -C $(DISK)\examples --file=Makefile all
426
	$(MAKE) SHELL=cmd -C $(DISK)\examples --file=Makefile all
434 427
	pushd ..\build\dist & ..\..\scripts\get-outputs.bat > "..\..\benchmarks-saf.txt" & popd
435 428
else
436 429
	$(MAKE) FAST_OPTION=-f -C $(DISK)/examples all

Also available in: Unified diff