Skip to content

Commit

Permalink
- Adding makefiles for modelica3d
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12849 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Sep 10, 2012
1 parent f5b6906 commit 370d0c7
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
11 changes: 11 additions & 0 deletions Compiler/FrontEnd/ModelicaBuiltin.mo
Expand Up @@ -2443,6 +2443,17 @@ function isExperiment "An experiment is defined as having annotation Experiment(
external "builtin";
end isExperiment;

function loadModelica3d "Please start the server using python $OPENMODELICAHOME/lib/omlibrary-modelica3d/osg-gtk/dbus-server.py or blender2.59"
output Boolean status;
protected
String m3d;
algorithm
status := loadModel(Modelica,{"3.1"});
status := status and loadModel(ModelicaServices,{"1.0 modelica3d"});
m3d:=getInstallationDirectoryPath()+"/lib/omlibrary-modelica3d/";
status := status and min(loadFile({m3d + file for file in {"DoublePendulum.mo","Engine1b.mo","Internal.mo","Pendulum.mo"}}));
end loadModelica3d;

annotation(preferredView="text");
end Scripting;

Expand Down
17 changes: 15 additions & 2 deletions Makefile.common
@@ -1,4 +1,4 @@
inclu.PHONY : all omc omcd debug release mosh clean .testvariables mkbuilddirs all omc omcd debug release mosh clean qtclean qtclean-common difftool
inclu.PHONY : all omc omcd debug release mosh clean .testvariables mkbuilddirs all omc omcd debug release mosh clean qtclean qtclean-common difftool modelica3d

top_builddir = .
builddir_app=$(top_builddir)/build/Applications/
Expand Down Expand Up @@ -162,13 +162,24 @@ susan: all sustst
sustst:
(cd Compiler/susan_codegen && $(MAKE) -f Makefile test)

omlibrary: build/lib/omlibrary/stamp
omlibrary: build/lib/omlibrary/stamp modelica3d
build/lib/omlibrary/stamp: libraries/README
rm -rf build/lib/omlibrary
(cd libraries/ && find . -type d -not -path "*svn*" -exec install -m755 -d ../build/lib/omlibrary/{} \;)
(cd libraries/ && find . -type f -not -path "*svn*" -exec install -m644 {} ../build/lib/omlibrary/{} \;)
touch $@

modelica3d:
cd 3rdParty/modelica3d && mkdir -p build
cd 3rdParty/modelica3d/build && cmake -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 ..
make -C 3rdParty/modelica3d/build
cp -p 3rdParty/modelica3d/build/backends/osg-gtk/libm3d-osg-gtk.so 3rdParty/modelica3d/build/lib/proc3d/libproc3d.so build/lib/
cp -p 3rdParty/modelica3d/lib/modcount/src/c/modcount.h 3rdParty/modelica3d/lib/modbus/src/c/modbus.h build/include/omc/
cp -p 3rdParty/modelica3d/build/lib/modcount/libmodcount.a 3rdParty/modelica3d/build/lib/modbus/libmodbus.a build/lib/omc/
mkdir -p build/lib/omlibrary-modelica3d/blender2.59 build/lib/omlibrary-modelica3d/osg-gtk/
cp -p 3rdParty/modelica3d/examples/multibody/src/modelica/*.mo build/lib/omlibrary-modelica3d/
cp -p 3rdParty/modelica3d/backends/blender2.59/dbus-server.py build/lib/omlibrary-modelica3d/blender2.59/
cp -p 3rdParty/modelica3d/backends/osg-gtk/python/dbus-server.py build/lib/omlibrary-modelica3d/osg-gtk/
distclean: clean
(cd Compiler && $(MAKE) -f $(defaultMakefileTarget) reallyclean)
(cd Compiler/omc_debug && $(MAKE) -f $(defaultMakefileTarget) reallyclean)
Expand All @@ -190,6 +201,8 @@ clean: qtclean fmil-clean opencl_rt_clean
(cd Compiler/omc_profiler && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd mosh/src && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd PythonInterface && $(MAKE) -f $(defaultMakefileTarget) clean)
(cd 3rdParty/modelica3d/build ; $(MAKE) clean ; true)
(rm -rf 3rdParty/modelica3d/build)
rm -rf build/share build/lib build/include build/bin/OMShell* build/bin/OMNotebook* \
build/bin/omc build/bin/omc.exe build/bin/omcd build/bin/omcd.exe build/bin/omcp build/bin/omcp.exe build/bin/omc-diff build/bin/omc-diff.exe \
bom-error.log bom-error.sh tab-error.log
Expand Down

0 comments on commit 370d0c7

Please sign in to comment.