Revision 1436

trunk/scripts/admb/admb.bat (revision 1436)
131 131
  if defined ADMB_CFG_CXX (
132 132
    set CXX=!ADMB_CFG_CXX!
133 133
  )
134
  if defined ADMB_CFG_LL (
134
  if defined ADMB_CFG_LD (
135 135
    if not defined d (
136
      set LL=!ADMB_CFG_LL!
136
      set LD=!ADMB_CFG_LD!
137 137
    )
138 138
  )
139 139
  if defined ADMB_CFG_LDFLAGS (
......
143 143
if not defined CXX (
144 144
  set CXX=g++
145 145
)
146
if not defined LL (
146
if not defined LD (
147 147
  if not defined d (
148
    set LL=g++
148
    set LD=g++
149 149
  ) else (
150
    set LL=g++
150
    set LD=g++
151 151
  )
152 152
)
153 153
if defined g (
......
273 273
      set main=%%~na
274 274
      @REM set CMD=adlink!d!!g!!r!!fast! !objs!
275 275
      if defined d (
276
        set CMD=!LL!!LDFLAGS! -o !main!.dll !objs! !libs!
276
        set CMD=!LD!!LDFLAGS! -o !main!.dll !objs! !libs!
277 277
      ) else (
278
        set CMD=!LL!!LDFLAGS! -o !main!.exe !objs! !libs!
278
        set CMD=!LD!!LDFLAGS! -o !main!.exe !objs! !libs!
279 279
      )
280 280
      echo.&echo *** Linking !objs!:
281 281
      echo !CMD!
......
300 300
    set tpl=%%~na
301 301
    @REM set CMD=adlink!d!!g!!r!!fast! !tpl!.obj !objs!
302 302
    if defined d (
303
      set CMD=!LL!!LDFLAGS! -o !tpl!.dll !objs! !libs!
303
      set CMD=!LD!!LDFLAGS! -o !tpl!.dll !objs! !libs!
304 304
    ) else (
305 305
      if defined objs (
306
        set CMD=!LL!!LDFLAGS! -o !tpl!.exe !tpl!.obj !objs! !libs!
306
        set CMD=!LD!!LDFLAGS! -o !tpl!.exe !tpl!.obj !objs! !libs!
307 307
      ) else (
308
        set CMD=!LL!!LDFLAGS! -o !tpl!.exe !tpl!.obj !libs!
308
        set CMD=!LD!!LDFLAGS! -o !tpl!.exe !tpl!.obj !libs!
309 309
      )
310 310
    )
311 311
    if defined objs (

Also available in: Unified diff