Skip to content

Commit

Permalink
Remove odd linux32/linux64 hacks from when omc started using the wron…
Browse files Browse the repository at this point in the history
…g fmu platform string

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24780 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Feb 25, 2015
1 parent a63f281 commit 94cf0d3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Compiler/Template/CodegenCpp.tpl
Expand Up @@ -1632,8 +1632,8 @@ template simulationMainRunScript(SimCode simCode ,Text& extraFuncs,Text& extraFu
let libPaths = makefileParams.libPaths |> path => path; separator=";"

match makefileParams.platform
case "i386-pc-linux"
case "x86_64-linux" then
case "linux32"
case "linux64" then
<<
#!/bin/sh
<%preRunCommandLinux%>
Expand Down Expand Up @@ -2263,8 +2263,8 @@ end simulationMainDLLib;
template simulationMainDLLib2(String platform)
::=
match platform
case "i386-pc-linux"
case "x86_64-linux" then
case "linux32"
case "linux64" then
<<
"-ldl"
>>
Expand Down
2 changes: 1 addition & 1 deletion Compiler/Template/CodegenFMU.tpl
Expand Up @@ -1763,7 +1763,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
case "inline-euler" then "-D_OMC_INLINE_EULER"
case "inline-rungekutta" then "-D_OMC_INLINE_RK"%>'
let compilecmds = getPlatformString2(modelNamePrefix(simCode), makefileParams.platform, fileNamePrefix, dirExtra, libsPos1, libsPos2, makefileParams.omhome, FMUVersion)
let platformstr = match makefileParams.platform case "i386-pc-linux" then 'linux32' case "x86_64-linux" case "x86_64-pc-linux" then 'linux64' else '<%makefileParams.platform%>'
let platformstr = makefileParams.platform
<<
# Makefile generated by OpenModelica

Expand Down

0 comments on commit 94cf0d3

Please sign in to comment.