Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit 84fadec

Browse files
adrpoOpenModelica-Hudson
authored andcommitted
fix library order for ModelicaStandardTables on Windows
- this order should work for MSL 3.2.1, 3.2.2 and trunk
1 parent 0130f95 commit 84fadec

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Compiler/SimCode/SimCodeFunctionUtil.mo

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2091,6 +2091,7 @@ algorithm
20912091
(strs,names) := matchcontinue exp
20922092
local
20932093
String str, fopenmp;
2094+
list<String> strs1, strs2, names1, names2;
20942095

20952096
// Lapack is always included
20962097
case Absyn.STRING("lapack") then ({},{});
@@ -2152,7 +2153,10 @@ algorithm
21522153
case Absyn.STRING(str)
21532154
algorithm
21542155
if System.os()=="Windows_NT" and str=="ModelicaStandardTables" then
2155-
(strs,names) := getLibraryStringInGccFormat(Absyn.STRING("ModelicaMatIO"));
2156+
(strs1,names1) := getLibraryStringInGccFormat(Absyn.STRING("ModelicaIO"));
2157+
(strs2,names2) := getLibraryStringInGccFormat(Absyn.STRING("ModelicaMatIO"));
2158+
strs := listAppend(strs1, strs2);
2159+
names := listAppend(names1, names2);
21562160
else
21572161
strs := {};
21582162
names := {};

0 commit comments

Comments
 (0)