Revision 2226 trunk/scripts/admb/admb.bat

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"

Also available in: Unified diff