diff --git a/mhp-genom/Makefile b/mhp-genom/Makefile index 14679d3c4c0821265b1f8843e255b9a997423586..3f4afc48711cc94851fab56f4e5c4ffc3a6edfa6 100644 --- a/mhp-genom/Makefile +++ b/mhp-genom/Makefile @@ -2,7 +2,7 @@ # Created: Severin Lemaignan on Tue, 31 Aug 2010 # -DISTNAME= mhp-genom-3.6 +DISTNAME= mhp-genom-3.7 CATEGORIES= path MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=mhp-genom/} MASTER_REPOSITORY= git ssh://softs.laas.fr/git/robots/mhp-genom @@ -21,7 +21,7 @@ USE_LANGUAGES+= c c++ ##################### PKG_OPTIONS_REQUIRED_GROUPS= robot -PKG_OPTIONS_GROUP.robot= hrp2 jido simulation +PKG_OPTIONS_GROUP.robot= hrp2 jido pr2 simulation ## ## HRP2 @@ -61,6 +61,19 @@ define PKG_OPTION_SET.simulation include ../../motion/pilo-genom/depend.mk endef +## +## Pr2 +## +PKG_OPTION_DESCR.pr2= Compile MHP for Pr2 + +define PKG_OPTION_SET.pr2 + GENOM_ARGS+= -DPR2 + GENOM_ARGS+= -DUSE_GLUT + include ../../localization/pom-genom/depend.mk + include ../../math/gbM/depend.mk +endef + +PKG_SUGGESTED_OPTIONS+= pr2 ## ## SPARK synchonization @@ -80,7 +93,7 @@ PKG_SUGGESTED_OPTIONS+= spark GENOM_MODULE= mhp include ../../wip/libmove3d/depend.mk - +include ../../wip/libhri/depend.mk include ../../manipulation/genManip-genom/depend.mk include ../../architecture/genom/depend.mk diff --git a/mhp-genom/PLIST b/mhp-genom/PLIST index 07de9be1124808f825feb8bde3f963256e1dd5b2..4fe026ee3e27464dd41e26264fe5dcdcb6fc7e8b 100644 --- a/mhp-genom/PLIST +++ b/mhp-genom/PLIST @@ -1,24 +1 @@ -@comment Tue Nov 9 01:04:53 CET 2010 -bin/mhp -bin/mhpSendInitRqst -bin/mhpTest -include/mhp/mhpConst.h -include/mhp/mhpStruct.h -include/mhp/server/mhpEndian.h -include/mhp/server/mhpError.h -include/mhp/server/mhpMsgLib.h -include/mhp/server/mhpPosterLib.h -include/mhp/server/mhpPosterLibStruct.h -include/mhp/server/mhpPosterReadLibProto.h -include/mhp/server/mhpPosterShowLib.h -include/mhp/server/mhpPosterWriteLibProto.h -include/mhp/server/mhpPosterXMLLib.h -include/mhp/server/mhpPrint.h -include/mhp/server/mhpPrintXML.h -include/mhp/server/mhpScan.h -include/mhp/server/mhpType.h -lib/libmhpClient.la -lib/pkgconfig/mhp.pc -lib/tclserv/libmhpTclServ.la -share/modules/gen/mhp.gen -share/modules/tcl/mhpClient.tcl +@comment Fri Apr 15 20:04:44 CEST 2011 diff --git a/mhp-genom/depend.mk b/mhp-genom/depend.mk index 8a82f3ae5ddc06740ac903c1a6b584988b73c5da..c015ddb5c2aa3f4336c9518844e6d30ffc03ba3e 100644 --- a/mhp-genom/depend.mk +++ b/mhp-genom/depend.mk @@ -33,7 +33,7 @@ SYSTEM_SEARCH.mhp-genom=\ DEPEND_USE+= mhp-genom -DEPEND_ABI.mhp-genom?=mhp-genom>=3.4 +DEPEND_ABI.mhp-genom?=mhp-genom>=3.7 DEPEND_DIR.mhp-genom?=../../wip/mhp-genom #include ../../wip/?? diff --git a/mhp-genom/distinfo b/mhp-genom/distinfo index b2a44d4624627e57f3ed51c54ce7337ed785b038..8bbb42c4e85779870f1337356f29709e66579f96 100644 --- a/mhp-genom/distinfo +++ b/mhp-genom/distinfo @@ -1,3 +1,3 @@ -SHA1 (mhp-genom-3.6.tar.gz) = d7b2bf9bc622f26d17d5ed7aee8648ce12c33b9a -RMD160 (mhp-genom-3.6.tar.gz) = df8bcf63ef97140bc3fb910446e19de93acceda9 -Size (mhp-genom-3.6.tar.gz) = 27823 bytes +SHA1 (mhp-genom-3.7.tar.gz) = 5f279262f0c213f6e6a0ac27d88d1a672afefe09 +RMD160 (mhp-genom-3.7.tar.gz) = 719f1bdc18bd14551133e121457293d2ba10aabc +Size (mhp-genom-3.7.tar.gz) = 34397 bytes