Skip to content

Commit

Permalink
Add MSVC dummy static library dl.lib
Browse files Browse the repository at this point in the history
Avoid GCC linker errors on Linux for (module H5PL.c of) libhdf5.a depending on libdl.a

[ci skip]
  • Loading branch information
tbeu committed Mar 3, 2017
1 parent e38875d commit 9521174
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Binary file added ExternData/Resources/Library/win32/dl.lib
Binary file not shown.
Binary file added ExternData/Resources/Library/win64/dl.lib
Binary file not shown.
8 changes: 4 additions & 4 deletions ExternData/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, Excel XL
__iti_dll = "ITI_ED_MATFile.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_MATFile.h\"",
Library = {"ED_MATFile", "hdf5", "zlib"});
Library = {"ED_MATFile", "hdf5", "zlib", "dl"});
end getRealArray2D;
function getStringArray1D "Get 1D String values from MAT-file"
Expand All @@ -368,7 +368,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, Excel XL
__iti_dll = "ITI_ED_MATFile.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_MATFile.h\"",
Library = {"ED_MATFile", "hdf5", "zlib"});
Library = {"ED_MATFile", "hdf5", "zlib", "dl"});
end getStringArray1D;
annotation(Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={Text(lineColor={128,128,128},extent={{-90,-90},{90,90}},textString="f")}));
end MAT;
Expand Down Expand Up @@ -699,7 +699,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, Excel XL
__iti_dll = "ITI_ED_MATFile.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_MATFile.h\"",
Library = {"ED_MATFile", "hdf5", "zlib"});
Library = {"ED_MATFile", "hdf5", "zlib", "dl"});
end constructor;

function destructor "Clean up"
Expand All @@ -709,7 +709,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, Excel XL
__iti_dll = "ITI_ED_MATFile.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_MATFile.h\"",
Library = {"ED_MATFile", "hdf5", "zlib"});
Library = {"ED_MATFile", "hdf5", "zlib", "dl"});
end destructor;
end ExternMATFile;

Expand Down

0 comments on commit 9521174

Please sign in to comment.