Skip to content

Commit 1a757bd

Browse files
author
Stefan Brus
committed
- Now compiles in Linux
git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/OpenModelica1.5.0@4234 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 61a4d8d commit 1a757bd

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Compiler/Makefile.common

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ RTOBJ = $(srcdir)/runtime/systemimpl.o $(srcdir)/../c_runtime/libc_runtime.a \
2121
$(srcdir)/runtime/printimpl.o $(srcdir)/runtime/ptolemyio.o \
2222
$(srcdir)/runtime/errorext.o $(srcdir)/runtime/ErrorMessage.o \
2323
$(srcdir)/runtime/daeext.o $(CORBAOBJ) \
24-
$(srcdir)/modpar/libmodpar.a $(srcdir)/runtime/settingsimpl.o
24+
$(srcdir)/modpar/libmodpar.a $(srcdir)/runtime/settingsimpl.o \
25+
$(srcdir)/runtime/optmanager.o $(srcdir)/runtime/unitparser.o \
26+
$(srcdir)/runtime/unitparserext.o
2527

2628
# The MO sources
2729
SRCMO= Absyn.mo \
@@ -79,13 +81,12 @@ SRCMO= Absyn.mo \
7981
InstanceHierarchy.mo \
8082
UnitAbsyn.mo \
8183
MMath.mo \
82-
UnitParserExt.mo \
8384
UnitAbsynBuilder.mo \
84-
UnitChecker.mo
85+
UnitChecker.mo
8586

8687
# These are externally defined MO modules
8788
ALLMO = $(SRCMO) DAEEXT.mo Print.mo RTOpts.mo System.mo Parser.mo \
88-
TaskGraphExt.mo Corba.mo Socket.mo ErrorExt.mo Settings.mo OptManager.mo
89+
TaskGraphExt.mo Corba.mo Socket.mo ErrorExt.mo Settings.mo OptManager.mo UnitParserExt.mo
8990

9091
SRCC= $(SRCMO:.mo=.c)
9192
SRCH= $(SRCMO:.mo=.h)

Compiler/runtime/ptolemyio.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@
3434
*/
3535
#include <iostream>
3636
#include <fstream>
37-
#include <string>
37+
// #include <string>
3838

3939

4040

4141
using namespace std;
4242

4343
extern "C"
4444
{
45+
#include <string.h>
46+
#include <stdlib.h>
4547
#include "rml.h"
4648
#include "Values.h"
4749
#include <stdio.h>

Compiler/runtime/unitparserext.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ UnitParser* unitParser=0;
1111
stack<UnitParser*> rollbackStack;
1212

1313
#include <iostream>
14-
#include <string>
14+
// #include <string>
1515
#include <stack>
1616

1717
using namespace std;
@@ -22,6 +22,7 @@ extern "C"
2222
#include <assert.h>
2323
#include "rml.h"
2424
#include "../absyn_builder/yacclib.h"
25+
#include <string.h>
2526

2627

2728
void UnitParserExt_5finit(void)

0 commit comments

Comments
 (0)