Fix OSX compilation

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16375 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 16, 2013 · 1bd2e37 · 1bd2e37
1 parent f199620
commit 1bd2e37
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -1981,9 +1981,8 @@ end importFMU;
 /* Under Development */
 
 function simulate "simulates a modelica model by generating c code, build it and run the simulation executable.
- The only required argument is the className, while all others have some efault values.
- simulate(className, [startTime], [stopTime], [numberOfIntervals], [stepSize], [tolerance], [method], [fileNamePrefix],
-           [storeInTemp], [noClean], [options], [outputFormat], [variableFilter], [measureTime], [cflags], [simflags])
+ The only required argument is the className, while all others have some default values.
+ simulate(className, [startTime], [stopTime], [numberOfIntervals], [stepSize], [tolerance], [method], [fileNamePrefix], [options], [outputFormat], [variableFilter], [measureTime], [cflags], [simflags])
  Example command:
   simulate(A);
 "

diff --git a/Examples/ComplianceSuite.mos b/Examples/ComplianceSuite.mos
@@ -11,9 +11,6 @@ function last
 end last;
 ");getErrorString();
 
-deleteClass(ModelicaCompliance.Components.Declarations.DoubleDeclarationComps);getErrorString();
-deleteClass(ModelicaCompliance.Components.Declarations.DoubleDeclarationMixed);getErrorString();
-deleteClass(ModelicaCompliance.Components.Declarations.TypeNameAsComponentName);getErrorString();
 system("rm -f ModelicaCompliance.*.res");getErrorString();
 
 echo(false);

diff --git a/Makefile.in b/Makefile.in
@@ -22,7 +22,7 @@ CXX=@CXX@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
 CXXFLAGS=@CXXFLAGS@
-LINK=cp -frl
+LINK=@LINK@
 
 include Makefile.common