Skip to content

Commit

Permalink
Some cross-compilation fixes.
Browse files Browse the repository at this point in the history
- Adding switches to disable compiling parts for a bootstrapped compiler.
- New switches mainly used to cross-compile a minimal omc on the build platform that can be used to compile omc for the host platform.


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25827 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Apr 29, 2015
1 parent 876ee3e commit cd70933
Show file tree
Hide file tree
Showing 10 changed files with 194 additions and 32 deletions.
2 changes: 2 additions & 0 deletions Compiler/boot/Makefile.in
Expand Up @@ -9,7 +9,9 @@ TOP_DIR=@abs_top_builddir@
OMHOME=@abs_top_builddir@/build

LDFLAGS=-L. -L$(GEN_DIR) -L"$(OMHOME)/lib/omc" -lomparse -lomcruntime -lOpenModelicaRuntimeC -lModelicaExternalC -lantlr3 $(CORBALIBS) $(FMILIB) $(GSLIB) @RT_LDFLAGS@ @LIBSOCKET@ @LIBLPSOLVE55@ @OMC_LIBS@ @GRAPHLIB@ -lexpat
ifeq (@WITH_FMIL@,yes)
FMILIB = -L$(TOP_DIR)/3rdParty/FMIL/install/lib -lfmilib
endif
GSLIB = -L$(TOP_DIR)/3rdParty/graphstream/gs-netstream/c++/ -lnetstream
CPPFLAGS=-I"$(OMHOME)/include/omc/c" @CPPFLAGS@ -DADD_METARECORD_DEFINITIONS=
CORBALIBS=@CORBALIBS@
Expand Down
23 changes: 23 additions & 0 deletions Compiler/runtime/FMIImpl.c
Expand Up @@ -32,6 +32,27 @@
extern "C" {
#endif

#include "omc_config.h"

#ifdef NO_FMIL
void FMIImpl__initializeFMI1Import(void* fmi, void** fmiInfo, int version, void** typeDefinitionsList, void** experimentAnnotation, void** modelVariablesInstance, void** modelVariablesList, int input_connectors, int output_connectors)
{
MMC_THROW();
}
void FMIImpl__initializeFMI2Import(void* fmi, void** fmiInfo, int version, void** typeDefinitionsList, void** experimentAnnotation, void** modelVariablesInstance, void** modelVariablesList, int input_connectors, int output_connectors)
{
MMC_THROW();
}
int FMIImpl__initializeFMIImport(const char* file_name, const char* working_directory, int fmi_log_level, int input_connectors, int output_connectors, void** fmiContext, void** fmiInstance, void** fmiInfo, void** typeDefinitionsList, void** experimentAnnotation, void** modelVariablesInstance, void** modelVariablesList)
{
MMC_THROW();
}
void FMIImpl__releaseFMIImport(void *ptr1, void *ptr2, void *ptr3, const char* fmiVersion)
{
MMC_THROW();
}
#else

#include <stdio.h>
#include <stdint.h>

Expand Down Expand Up @@ -862,6 +883,8 @@ void FMIImpl__releaseFMIImport(void *ptr1, void *ptr2, void *ptr3, const char* f
fmi_import_free_context((fmi_import_context_t*)fmiContext);
}

#endif

#ifdef __cplusplus
}
#endif
3 changes: 3 additions & 0 deletions Compiler/runtime/config.unix.h.in
Expand Up @@ -32,6 +32,9 @@
#endif

#define CONFIG_LPSOLVEINC "@LPSOLVEINC@"
@NO_LPLIB@
@NO_LAPACK@
@NO_FMIL@

#define CONFIG_DEFAULT_OPENMODELICAHOME "@prefix@"
#define CONFIG_PATH_DELIMITER "/"
Expand Down

0 comments on commit cd70933

Please sign in to comment.