Changeset 14177


Ignore:
Timestamp:
Nov 26, 2019 10:17:25 AM (2 weeks ago)
Author:
Christian Andersson
Message:

Merged ticket:5884 into the release branch.

Location:
branches/2.16.x
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.16.x

    • Property svn:mergeinfo changed
      /trunk (added)merged: 14161
  • branches/2.16.x/CHANGELOG.txt

    r14113 r14177  
    11================= Unreleased ==================
     2; Fixed ; Minor ; Runtime ; #5884
     3Fixed an issue on Linux with linking external model libraries
     4
    25; Change ; Minor ; Compiler ; #5872
    36Activated the compiler option "external_constant_evaluation_dynamic" by
  • branches/2.16.x/RuntimeLibrary/Makefiles/Makefile.linux

    r13719 r14177  
    116116# Libraries necessary to link with jmi
    117117# Reused parts
    118 LIBS_FMU_STD = -ljmi -ldl "-L$(JMI_LIB_DIR)" $(EXT_LIB_DIRS) $(EXTERNAL_LIBS) -lModelicaExternalC -lzlib -ljmi
     118LIBS_FMU_STD = -ljmi "-L$(JMI_LIB_DIR)" $(EXT_LIB_DIRS) $(EXTERNAL_LIBS) -lModelicaExternalC -lzlib -ljmi -ldl
    119119LIB_SUNDIALS = -L$(SUNDIALS_LIB_DIR) -l:libsundials_kinsol.a -l:libsundials_nvecserial.a
    120120LIB_MINPACK  = -L$(MINPACK_LIB_DIR) -l:libcminpack.a
Note: See TracChangeset for help on using the changeset viewer.