Skip to content

Commit

Permalink
- Make compilation a little faster
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12507 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Aug 14, 2012
1 parent 56973c0 commit e2d66c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Compiler/runtime/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ ptolemyio_rml.o : ptolemyio.cpp errorext.h
ptolemyio_omc.o : ptolemyio.cpp errorext.h $(RML_COMPAT)
ErrorMessage.o : ErrorMessage.cpp ErrorMessage.hpp errorext.h
FMI_rml.o : FMIimpl.c

$(CC) -c -o $@ $(CPPFLAGS) -I$(FMIINCLUDE) $(CFLAGS) $<
clean:
$(RM) -rf *.a *.o omc_communication.cc omc_communication.h omc_communication-*
2 changes: 1 addition & 1 deletion Compiler/runtime/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,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) -I$(FMIINCLUDE)
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)

include Makefile.common

Expand Down
5 changes: 3 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ omcd: difftool interactive docs fmi fmil

fmil:
mkdir -p 3rdParty/FMIL/build
(cd 3rdParty/FMIL/build; $(CMAKE) .. -G $(CMAKE_TARGET); $(MAKE); $(MAKE) install)

(cd 3rdParty/FMIL/build && $(CMAKE) -D FMILIB_BUILD_SHARED_LIB:Bool=OFF -D FMILIB_BUILD_TESTS:Bool=OFF .. -G $(CMAKE_TARGET))
$(MAKE) -C 3rdParty/FMIL/build
$(MAKE) -C 3rdParty/FMIL/build install
qtclean-common:
rm -rf OMShell/bin/OMShell$(EXE) OMShell/OMShellGUI/omc_communication.*
rm -rf OMNotebook/bin/OMNotebook$(EXE) OMNotebook/OMNotebookGUI/omc_communication.*
Expand Down

0 comments on commit e2d66c1

Please sign in to comment.