Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-doc
Commits
1289e755
Commit
1289e755
authored
Nov 23, 2018
by
Joseph Mirabel
Browse files
Fix Makefile
* branch of pinocchio * use osg-dae
parent
8d49b186
Changes
1
Hide whitespace changes
Inline
Side-by-side
doc/Makefile
View file @
1289e755
...
...
@@ -26,7 +26,7 @@ else
BUILD_FOLDER
=
build-rel
endif
OSG_PACKAGE
=
OpenSceneGraph-dae-plugin
OSG_PACKAGE
=
osg-dae
#OSG_PACKAGE=OpenSceneGraph-3.4.0
WGET
=
wget
--quiet
...
...
@@ -129,8 +129,8 @@ hpp_benchmark_repository=${HPP_REPO}
collada-dom_branch
=
master
collada-dom_repository
=
${HPP_REPO}
OpenSceneGraph-dae-plugin
_branch
=
master
OpenSceneGraph-dae-plugin
_repository
=
${
HPP
_REPO}
osg-dae
_branch
=
master
osg-dae
_repository
=
${
SOT
_REPO}
gepetto-viewer_branch
=
master
gepetto-viewer_repository
=
${HPP_REPO}
...
...
@@ -178,7 +178,7 @@ hpp_romeo_repository=${HPP_REPO}
romeo_branch
=
master
romeo_repository
=
${HPP_REPO}
OpenSceneGraph-dae-plugin
_extra_flags
=
-DCOLLADA_DYNAMIC_LIBRARY
=
${INSTALL_HPP_DIR}
/lib/libcollada14dom.so
-DCOLLADA_INCLUDE_DIR
=
${INSTALL_HPP_DIR}
/include/collada-dom
osg-dae
_extra_flags
=
-DCOLLADA_DYNAMIC_LIBRARY
=
${INSTALL_HPP_DIR}
/lib/libcollada14dom.so
-DCOLLADA_INCLUDE_DIR
=
${INSTALL_HPP_DIR}
/include/collada-dom
OpenSceneGraph-3.4.0_extra_flags
=
-DDESIRED_QT_VERSION
=
${QT_VERSION}
-DCOLLADA_DYNAMIC_LIBRARY
=
${INSTALL_HPP_DIR}
/lib/libcollada14dom.so
-DCOLLADA_INCLUDE_DIR
=
${INSTALL_HPP_DIR}
/include/collada-dom
-DLIB_POSTFIX
=
""
collada-dom_extra_flags
=
-DBUILD_SHARED_LIBS
=
TRUE
-DOPT_COLLADA15
=
FALSE
...
...
@@ -274,8 +274,8 @@ hpp_tutorial.configure.dep: hpp-gepetto-viewer.install iai_maps.install \
hpp-manipulation-corba.install hpp_tutorial.checkout
hpp_benchmark.configure.dep
:
hpp_benchmark.checkout
collada-dom.configure.dep
:
collada-dom.checkout
OpenSceneGraph-dae-plugin
.configure.dep
:
collada-dom.install
\
OpenSceneGraph-dae-plugin
.checkout
osg-dae
.configure.dep
:
collada-dom.install
\
osg-dae
.checkout
OpenSceneGraph-3.4.0.configure.dep
:
collada-dom.install
\
OpenSceneGraph-3.4.0.checkout
gepetto-viewer.configure.dep
:
${OSG_PACKAGE}.install
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment