Revision 2226

trunk/scripts/admb/admb.bat (revision 2226)
145 145
  )
146 146
  if defined fast (
147 147
    set CXXFLAGS=!CXXFLAGS! /DOPT_LIB
148
    if not exist "!ADMB_HOME!\contrib\lib\contribo.lib" (
148
    if not exist "!ADMB_HOME!\lib\admb-contribo.lib" (
149 149
      set libs="!ADMB_HOME!\lib\admbo.lib" /link
150 150
    ) else (
151
      set libs="!ADMB_HOME!\contrib\lib\contribo.lib" "!ADMB_HOME!\lib\admbo.lib" /link
151
      set libs="!ADMB_HOME!\lib\admb-contribo.lib" /link
152 152
    )
153 153
  ) else (
154
    if not exist "!ADMB_HOME!\contrib\lib\contrib.lib" (
154
    if not exist "!ADMB_HOME!\lib\admb-contrib.lib" (
155 155
      set libs="!ADMB_HOME!\lib\admb.lib" /link
156 156
    ) else (
157
      set libs="!ADMB_HOME!\contrib\lib\contrib.lib" "!ADMB_HOME!\lib\admb.lib" /link
157
      set libs="!ADMB_HOME!\lib\admb-contrib.lib" /link
158 158
    )
159 159
  )
160
  if not exist "!ADMB_HOME!\contrib\lib\contrib.lib" (
160
  if not exist "!ADMB_HOME!\lib\admb-contrib.lib" (
161 161
    set CXXFLAGS=!CXXFLAGS! /I. /I"!ADMB_HOME!\include" /I"!ADMB_HOME!\include\contrib"
162 162
  ) else (
163 163
    set CXXFLAGS=!CXXFLAGS! /I. /I"!ADMB_HOME!\include" /I"!ADMB_HOME!\contrib\include"
......
213 213
  if defined d (
214 214
    set CXXFLAGS=!CXXFLAGS! -DBUILDING_DLL
215 215
  )
216
  if not exist "!ADMB_HOME!\contrib\lib\libcontrib.a" (
216
  if not exist "!ADMB_HOME!\lib\libadmb-contrib.a" (
217 217
    set CXXFLAGS=!CXXFLAGS! -fpermissive -I. -I"!ADMB_HOME!\include" -I"!ADMB_HOME!\include\contrib"
218 218
  ) else (
219 219
    set CXXFLAGS=!CXXFLAGS! -fpermissive -I. -I"!ADMB_HOME!\include" -I"!ADMB_HOME!\contrib\include"
trunk/Makefile (revision 2226)
37 37
cl-all: 
38 38
	nmake cl-src
39 39
	nmake cl-contrib
40
	nmake cl-shared
40 41
cl-debug:
41 42
	pushd src& nmake DEBUG=yes all
42 43
	pushd contrib& nmake DEBUG=yes all
trunk/contrib/Makefile (revision 2226)
9 9
	$(MAKE) contrib-includes
10 10
	$(MAKE) contrib-libs
11 11
	$(MAKE) contrib-ad2csv
12
	@echo ADMB contrib build completed.
13 12
	
14
shared: all
15
	IF EXIST $(DESTDIR)\contrib\lib\contrib.dll del $(DESTDIR)\contrib\lib\contrib.dll
16
	link /DLL /OUT:$(DESTDIR)\contrib\lib\contrib.dll /NOLOGO /IGNORE:4006 $(OBJDESTDIR)\saflp-contrib*.obj $(DESTDIR)\lib\admb.lib
17
	IF EXIST $(DESTDIR)\contrib\lib\contribo.dll del $(DESTDIR)\contrib\lib\contribo.dll
18
	link /DLL /OUT:$(DESTDIR)\contrib\lib\contribo.dll /NOLOGO /IGNORE:4006 $(OBJDESTDIR)\optlp-contrib*.obj $(DESTDIR)\lib\admbo.lib
19
	@echo ADMB contrib shared build completed.
13
shared:
14
	IF EXIST $(DESTDIR)\lib\admb-contrib.dll del $(DESTDIR)\lib\admb-contrib.dll
15
	pushd $(OBJDESTDIR)& link /DLL /OUT:..\..\dist\lib\admb-contrib.dll /NOLOGO /IGNORE:4006 ..\..\dist\lib\admb.lib contrib-saflp-*.obj
16
	IF EXIST $(DESTDIR)\lib\admb-contribo.dll del $(DESTDIR)\lib\admb-contribo.dll
17
	pushd $(OBJDESTDIR)& link /DLL /OUT:..\..\dist\lib\admb-contribo.dll /NOLOGO /IGNORE:4006 ..\..\dist\lib\admbo.lib contrib-optlp-*.obj
20 18

  
21 19
contrib-includes: contrib-dirs
22 20
	pushd ecolib& $(MAKE) CONTRIB_INCLUDE=..\$(DESTDIR)\contrib\include includes
......
33 31
	IF NOT EXIST $(OBJDESTDIR) md $(OBJDESTDIR)
34 32

  
35 33
contrib-libs: contrib-ecolib contrib-gdbprintlib contrib-qfclib contrib-statslib contrib-src
36
	IF EXIST $(DESTDIR)\contrib\lib\contrib.lib del $(DESTDIR)\contrib\lib\contrib.lib
37
	lib /OUT:$(DESTDIR)\contrib\lib\contrib.lib /NOLOGO /IGNORE:4006 $(OBJDESTDIR)\contrib-saflp-*.obj
38
	IF EXIST $(DESTDIR)\contrib\lib\contribo.lib del $(DESTDIR)\contrib\lib\contribo.lib
39
	lib /OUT:$(DESTDIR)\contrib\lib\contribo.lib /NOLOGO /IGNORE:4006 $(OBJDESTDIR)\contrib-optlp-*.obj
34
	IF EXIST $(DESTDIR)\lib\admb-contrib.lib del $(DESTDIR)\lib\admb-contrib.lib
35
	copy $(DESTDIR)\lib\admb.lib $(DESTDIR)\lib\admb-contrib.lib
36
	pushd $(OBJDESTDIR)& lib ..\..\dist\lib\admb-contrib.lib /NOLOGO /IGNORE:4006 contrib-saflp-*.obj
37
	IF EXIST $(DESTDIR)\lib\admb-contribo.lib del $(DESTDIR)\lib\admb-contribo.lib
38
	copy $(DESTDIR)\lib\admbo.lib $(DESTDIR)\lib\admb-contribo.lib
39
	pushd $(OBJDESTDIR)& lib ..\..\dist\lib\admb-contribo.lib /NOLOGO /IGNORE:4006 contrib-optlp-*.obj
40 40

  
41 41
contrib-ad2csv:
42 42
	pushd ad2csv& $(MAKE)

Also available in: Unified diff