Skip to content

Commit

Permalink
Fixes to FMU (mingw commands conflicting with Windows commands)
Browse files Browse the repository at this point in the history
- force cmd.exe to choose mkdir.exe instead of mkdir
- use && instead of ; for command separation.



git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10051 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Oct 8, 2011
1 parent 37722d6 commit 0fd12a1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Compiler/susan_codegen/SimCode/SimCodeFMU.tpl
Expand Up @@ -879,17 +879,17 @@ match platform
<%\t%> mv <%fileNamePrefix%>_records.c <%fileNamePrefix%>/sources/<%fileNamePrefix%>_records.c
<%\t%> mv modelDescription.xml <%fileNamePrefix%>/modelDescription.xml
<%\t%> cp <%omhome%>/lib/omc/libexec/gnuplot/binary/libexpat-1.dll <%fileNamePrefix%>/binaries/<%platform%>/
<%\t%> cd <%fileNamePrefix%>; zip -r ../<%fileNamePrefix%>.fmu *
<%\t%> cd <%fileNamePrefix%>&& zip -r ../<%fileNamePrefix%>.fmu *
<%\t%> rm -rf <%fileNamePrefix%>
<%\t%> rm -f <%fileNamePrefix%>.def <%fileNamePrefix%>.o <%fileNamePrefix%>_FMU.libs <%fileNamePrefix%>_FMU.makefile <%fileNamePrefix%>_FMU.o <%fileNamePrefix%>_records.o

<%fileNamePrefix%>.dll: clean <%fileNamePrefix%>_FMU.o <%fileNamePrefix%>.o <%fileNamePrefix%>_records.o
<%\t%> $(CXX) -shared -I. -o <%fileNamePrefix%>.dll <%fileNamePrefix%>_FMU.o <%fileNamePrefix%>.o <%fileNamePrefix%>_records.o $(CPPFLAGS) <%dirExtra%> <%libsPos1%> <%libsPos2%> $(CFLAGS) $(LDFLAGS) -linteractive $(SENDDATALIBS) <%match System.os() case "OSX" then "-lf2c" else "-Wl,-Bstatic -lf2c -Wl,-Bdynamic"%> -Wl,--kill-at

<%\t%> mkdir -p <%fileNamePrefix%>
<%\t%> mkdir -p <%fileNamePrefix%>/binaries
<%\t%> mkdir -p <%fileNamePrefix%>/binaries/<%platform%>
<%\t%> mkdir -p <%fileNamePrefix%>/sources
<%\t%> "mkdir.exe" -p <%fileNamePrefix%>
<%\t%> "mkdir.exe" -p <%fileNamePrefix%>/binaries
<%\t%> "mkdir.exe" -p <%fileNamePrefix%>/binaries/<%platform%>
<%\t%> "mkdir.exe" -p <%fileNamePrefix%>/sources
>>
case "LINUX"
case "Unix" then
Expand Down

0 comments on commit 0fd12a1

Please sign in to comment.