Revision 1471

trunk/src/GNUmakefile (revision 1471)
44 44

  
45 45
ifdef CXXFLAGS
46 46
  USER_CXXFLAGS:= $(CXXFLAGS)
47
  CXXFLAGS:= $(CXXFLAGS)
48 47
endif
49 48

  
50 49
ifdef LDFLAGS
......
52 51
endif
53 52

  
54 53
ifdef DEBUG
55
  CXXFLAGS:= -g $(CXXFLAGS)
54
  ADCXXFLAGS:= -g $(ADCXXFLAGS)
56 55
else
57 56
  ifeq ($(CXX),openCC)
58
    CXXFLAGS:= -O2 $(CXXFLAGS)
57
    ADCXXFLAGS:= -O2 $(ADCXXFLAGS)
59 58
  else
60
    CXXFLAGS:= -O3 $(CXXFLAGS)
59
    ADCXXFLAGS:= -O3 $(ADCXXFLAGS)
61 60
  endif
62 61
endif
63 62

  
64
ifdef BUILD_SHARED_LIBRARY
65
  CXXFLAGS:= -fPIC $(CXXFLAGS)
66
endif
67

  
68 63
ifneq ($(CXX),CC)
69
CXXFLAGS:= -Wall $(CXXFLAGS)
64
ADCXXFLAGS:= -Wall $(ADCXXFLAGS)
70 65
endif
71 66

  
72
CXXFLAGS:= $(CXXFLAGS) -DSAFE_ALL -D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE
67
ADCXXFLAGS:= $(ADCXXFLAGS) -DSAFE_ALL -D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE
73 68

  
74 69
ifeq ($(SHELL),cmd)
75
CXXFLAGS:= $(CXXFLAGS) -I..\build\dist\include
70
ADCXXFLAGS:= $(ADCXXFLAGS) -I..\build\dist\include
76 71
else
77
CXXFLAGS:= $(CXXFLAGS) -I../build/dist/include
72
ADCXXFLAGS:= $(ADCXXFLAGS) -I../build/dist/include
78 73
endif
79 74

  
75
override CXXFLAGS += $(ADCXXFLAGS)
76

  
80 77
CXXFLAGS_OPT_LIB:=$(subst -DSAFE_ALL,-DOPT_LIB,$(CXXFLAGS))
81 78

  
82 79
include df1b2-separable/objects.lst
......
155 152
	copy ..\scripts\admb\root-admb.bat ${DIST}\admb.cmd
156 153
	copy ..\scripts\admb\adlink.bat ${DIST}\bin\adlink.cmd
157 154
	copy ..\scripts\admb\adcomp.bat ${DIST}\bin\adcomp.cmd
158
	$(MAKE) --directory=df1b2-separable CC=$(CC) DIST=..\${DIST} bins
159
	$(MAKE) --directory=nh99 CC=$(CC) DIST=..\${DIST} bins
155
	$(MAKE) --directory=df1b2-separable CC=gcc DIST=..\${DIST} bins
156
	$(MAKE) --directory=nh99 CC=gcc DIST=..\${DIST} bins
160 157
else
161 158
	mkdir -p ${DIST}/bin
162 159
	cp df1b2-separable/seddf1b* df1b2-separable/sedf1b2* ${DIST}/bin
trunk/src/nh99/GNUmakefile (revision 1471)
1
ifeq ($(SHELL),sh.exe)
1
ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
2 2
bins: $(DIST)\bin\tpl2cpp.exe
3 3

  
4 4
$(DIST)\bin\tpl2cpp.exe: tpl2cpp.c
trunk/src/df1b2-separable/GNUmakefile (revision 1471)
1
ifeq ($(SHELL),sh.exe)
1
ifeq (sh.exe,$(findstring sh.exe,$(SHELL)))
2 2
bins: $(DIST)\bin\tpl2rem.exe
3 3

  
4 4
$(DIST)\bin\tpl2rem.exe: tpl2rem.c
trunk/docs/install/QuickStartWindows.txt (revision 1471)
67 67

  
68 68
       _**Note** — Do not use the make utility from Rtools because it is a older version which is incompatible with the current ADMB build files._
69 69

  
70
       To build 64 bit with **Rtools**, use the command below 
71

  
72
        C:\admb\> utilities\make CXXFLAGS=-m64 LDFLAGS=-m64
73

  
70 74
       If **MinGW-Msys** was installed and is included in System Enviroment PATH, use the command below.
71 75

  
72 76
        C:\admb\> make

Also available in: Unified diff