- Compile FMIL.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12496 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 13, 2012 · b40e6bb · b40e6bb
1 parent 060c012
commit b40e6bb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/Compiler/omc_release/Makefile.in b/Compiler/omc_release/Makefile.in
@@ -15,6 +15,7 @@ CXX	= @CXX@
 CFLAGS	= @CFLAGS@
 RMLHOME	= @rmlhome@
 RMLINC  = -I$(RMLHOME)/include/plain
+FMILIB = -L../../3rdParty/FMIL/install/lib -lfmilib_shared
 
 EXEEXT  = @EXEEXT@
 
@@ -42,4 +43,4 @@ include $(srcdir)/Makefile.compiler_subdirs.common
 	# You're using the proper Unix Makefile. Thanks for making my life easier.
 
 $(PROG): $(SRCO) $(SUBDIRS)
-	$(CXX) $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS)
+	$(CXX) $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS) $(FMILIB)
diff --git a/Compiler/runtime/FMIimpl.c b/Compiler/runtime/FMIimpl.c
@@ -32,7 +32,6 @@
 extern "C" {
 #endif
 
-#if defined(__MINGW32__) || defined(_MSC_VER)
 #include <stdio.h>
 
 #include "systemimpl.h"
@@ -114,12 +113,6 @@ int FMIImpl__importFMU(char *fileName, char* workingDirectory)
   fmi_import_free_context(context);
   return 1;
 }
-#else
-int FMIImpl__importFMU(char *fileName, char* workingDirectory)
-{
-  return 1;
-}
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/Compiler/runtime/Makefile.in b/Compiler/runtime/Makefile.in
@@ -7,6 +7,7 @@
 USE_CORBA = @USE_CORBA@
 
 RMLINCLUDE = @rmlinc@
+FMIINCLUDE = ../../3rdParty/FMIL/install/include
 CFLAGS = @CFLAGS@ $(USE_CORBA)
 
 ifdef USE_CORBA
@@ -27,7 +28,7 @@ CXX	= @CXX@
 IDL	= @IDLCMD@
 IDLPYTHON = @IDLPYTHONCMD@
 CXXFLAGS = $(CFLAGS)
-CPPFLAGS = -I$(RMLINCLUDE) -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I$(srcdir) -I. $(CORBAINCL)  
+CPPFLAGS = -I$(RMLINCLUDE) -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I$(srcdir) -I. $(CORBAINCL) -I$(FMIINCLUDE)  
 
 include Makefile.common
 

diff --git a/Makefile.in b/Makefile.in
@@ -9,6 +9,8 @@ libdir = @libdir@
 includedir = @includedir@
 datadir = @datadir@
 docdir = @docdir@
+CMAKE = cmake
+CMAKE_TARGET = "Unix Makefiles"
 
 defaultMakefileTarget = Makefile
 QMAKE=@QMAKE@
@@ -24,12 +26,16 @@ settings:
 
 difftool: mkbuilddirs
 	$(MAKE) -C testsuite/difftool
-omc: difftool interactive docs fmi
+omc: difftool interactive docs fmi fmil
 	(cd Compiler && $(MAKE) -f Makefile release)
 
-omcd: difftool interactive docs fmi
+omcd: difftool interactive docs fmi fmil
 	(cd Compiler && $(MAKE) -f Makefile debug)
 
+fmil:
+	mkdir -p 3rdParty/FMIL/build
+	(cd 3rdParty/FMIL/build; $(CMAKE) .. -G $(CMAKE_TARGET); $(MAKE); $(MAKE) install)
+
 qtclean-common:
 	rm -rf OMShell/bin/OMShell$(EXE) OMShell/OMShellGUI/omc_communication.*
 	rm -rf OMNotebook/bin/OMNotebook$(EXE) OMNotebook/OMNotebookGUI/omc_communication.*