Skip to content

Commit

Permalink
- I still try to fix the cJSON bug...
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20446 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Marcus Walther committed May 7, 2014
1 parent d101bb4 commit bafb80b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Compiler/runtime/Makefile.in
Expand Up @@ -14,6 +14,7 @@ endif

FMIINCLUDE = ../../3rdParty/FMIL/install/include
GRAPHSTREAMINCLUDE = ../../3rdParty/graphstream/gs-netstream/c++/src/
CJSONINCLUDE = ../../3rdParty/cJSON/
CFLAGS = @CFLAGS@ $(USE_CORBA)
OMPCC = @OMPCC@

Expand All @@ -37,7 +38,7 @@ CXX = @CXX@
IDL = @IDLCMD@
IDLPYTHON = @IDLPYTHONCMD@
CXXFLAGS = $(CFLAGS)
CPPFLAGS = @CPPFLAGS@ $(RMLINCLUDE) -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/simulation/libf2c -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) -I$(top_builddir)/3rdParty/gc-7.2/include -I$(GRAPHSTREAMINCLUDE)
CPPFLAGS = @CPPFLAGS@ $(RMLINCLUDE) -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/simulation/libf2c -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) -I$(top_builddir)/3rdParty/gc-7.2/include -I$(GRAPHSTREAMINCLUDE) -I$(CJSONINCLUDE)

include Makefile.common

Expand Down
2 changes: 1 addition & 1 deletion Makefile.common
Expand Up @@ -49,7 +49,7 @@ mkbuilddirs:

release: omc-diff omc

bootstrap-dependencies: omc-diff interactive docs fmi fmil opencl_rt lis graphstream cjson
bootstrap-dependencies: omc-diff interactive docs fmi fmil opencl_rt lis graphstream
# NOTE: OpenModelicaBootstrappingHeader.h has to be regenerated without any other process writing to so/etc or you get bus errors
$(MAKE) -C Compiler OpenModelicaBootstrappingHeader.h
$(MAKE) -C Compiler/runtime install
Expand Down

0 comments on commit bafb80b

Please sign in to comment.