Revision 1482

trunk/scripts/admb/admb.bat (revision 1482)
219 219
    set CXXFLAGS=!CXXFLAGS! -D__GNUDOS__ -Dlinux -DUSE_LAPLACE -fpermissive -I. -I!ADMB_HOME!\include -I!ADMB_HOME!\contrib\include
220 220
  )
221 221
)
222
if defined MINGW_HOME (
223
  set PATH=!ADMB_HOME!\bin;!MINGW_HOME!\bin;!PATH!
224
) else (
225
  set PATH=!ADMB_HOME!\bin;!ADMB_HOME!\utilities\mingw\bin;!PATH!
226
)
222
set PATH=!ADMB_HOME!\bin;!ADMB_HOME!\utilities\mingw\bin;!PATH!
227 223
if not defined tpls (
228 224
  if not defined srcs (
229 225
    if not defined objs (
trunk/src/GNUmakefile (revision 1482)
6 6
    else
7 7
      MYPWD=$(shell cmd /C cd)
8 8
    endif
9
    ifdef MINGW_HOME
10
      PATH:=$(MINGW_HOME)\bin;$(PATH)
11
    else
12
      PATH:=$(MYPWD)\..\utilities\mingw\bin;$(PATH)
13
    endif
14
    PATH:=$(PATH);$(MYPWD)\..\utilities
9
    PATH:=$(MYPWD)\..\utilities\mingw\bin;$(PATH);$(MYPWD)\..\utilities
15 10
  else
16
    ifdef MINGW_HOME
17
      MINGW_DIR=$(shell cd $(MINGW_HOME) && pwd)
18
      PATH:=$(MINGW_DIR)/bin:$(PATH)
19
    endif
20
    MYPWD=$(shell pwd)
21 11
    ifneq ($(TERM),xterm)
12
      MYPWD=$(shell pwd)
22 13
      PATH:=$(MYPWD)/../utilities/mingw/bin:$(PATH)
23 14
    endif
24 15
    PATH:=$(PATH):$(MYPWD)/../utilities
......
395 386
	cp -R ../src $(DIST)
396 387
	cp -R ../scripts $(DIST)
397 388
endif
389

  
390
check:
391
	@echo "SHELL: $(SHELL)"
392
	@echo "PATH: $(PATH)"
393
	@echo "TERM: $(TERM)"
394
	@echo "MAKE: $(MAKE)"
395
	@echo "CXX: $(CXX)"
396
	@echo "OS: $(OS)"
397
	@echo "OSTYPE: $(OSTYPE)"
trunk/contrib/GNUmakefile (revision 1482)
1 1
ifeq ($(OS),Windows_NT)
2 2
  ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
3 3
    SHELL = cmd
4
    PATH:=..\..\utilities\mingw\bin;..\utilities\mingw\bin;$(PATH)
4
    ifeq ($(SHELL),cmd)
5
      MYPWD=$(shell cd)
6
    else
7
      MYPWD=$(shell cmd /C cd)
8
    endif
9
    PATH:=$(MYPWD)\..\utilities\mingw\bin;$(PATH);$(MYPWD)\..\utilities
5 10
  else
6 11
    ifneq ($(TERM),xterm)
7
      PATH:=../../utilities/mingw/bin:../utilities/mingw/bin:$(PATH)
12
      MYPWD=$(shell pwd)
13
      PATH:=$(MYPWD)/../utilities/mingw/bin:$(PATH)
8 14
    endif
15
    PATH:=$(PATH):$(MYPWD)/../utilities
9 16
  endif
10 17
endif
11 18
ifeq ($(SHELL),cmd)
......
33 40

  
34 41
shared: all
35 42
ifeq ($(SHELL),cmd)
36
	$(CXX) -static -shared $(LDFLAGS) -o ..\build\dist\contrib\lib\contrib.dll ..\build\dist\lib\admb.dll -Wl,--whole-archive ..\build\dist\contrib\lib\libcontrib.a -Wl,--no-whole-archive
37
	$(CXX) -static -shared $(LDFLAGS) -o ..\build\dist\contrib\lib\contribo.dll ..\build\dist\lib\admbo.dll -Wl,--whole-archive ..\build\dist\contrib\lib\libcontribo.a -Wl,--no-whole-archive
43
	$(CXX) -static -shared $(LDFLAGS) -o ..\build\dist\contrib\lib\contrib.dll -Wl,--whole-archive ..\build\dist\contrib\lib\libcontrib.a -Wl,--no-whole-archive -Wl,-Bdynamic ..\build\dist\lib\admb.dll
44
	$(CXX) -static -shared $(LDFLAGS) -o ..\build\dist\contrib\lib\contribo.dll -Wl,--whole-archive ..\build\dist\contrib\lib\libcontribo.a -Wl,--no-whole-archive -Wl,-Bdynamic ..\build\dist\lib\admbo.dll
38 45
else
39 46
  ifeq (LLVM,$(findstring LLVM,$(shell $(CXX) --version)))
40 47
	$(CXX) -shared $(LDFLAGS) -o../build/dist/contrib/lib/libcontrib.so -Wl,-force_load ../build/dist/contrib/lib/libcontrib.a ../build/dist/lib/libadmb.so
......
67 74
endif
68 75

  
69 76
contrib-ad2csv: contrib-dirs
70
	$(MAKE) --directory=ad2csv OPTION=$(OPTION) CONTRIB_BIN=$(CONTRIB_BIN)
77
	$(MAKE) --directory=ad2csv CXXFLAGS= LDFLAGS= OPTION=$(OPTION) CONTRIB_BIN=$(CONTRIB_BIN)
71 78

  
72 79
contrib-ecolib:
73
	$(MAKE) --directory=ecolib OPTION=$(OPTION) CONTRIB_OBJS_DIR=$(CONTRIB_OBJS_DIR)
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff