| config.h | config.h | |||
|---|---|---|---|---|
| skipping to change at line 40 | skipping to change at line 40 | |||
| #define OPENRAVE_API OPENRAVE_HELPER_DLL_IMPORT | #define OPENRAVE_API OPENRAVE_HELPER_DLL_IMPORT | |||
| #endif // OPENRAVE_DLL_EXPORTS | #endif // OPENRAVE_DLL_EXPORTS | |||
| #define OPENRAVE_LOCAL OPENRAVE_HELPER_DLL_LOCAL | #define OPENRAVE_LOCAL OPENRAVE_HELPER_DLL_LOCAL | |||
| #else // OPENRAVE_DLL is not defined: this means OpenRAVE is a static lib. | #else // OPENRAVE_DLL is not defined: this means OpenRAVE is a static lib. | |||
| #define OPENRAVE_API | #define OPENRAVE_API | |||
| #define OPENRAVE_LOCAL | #define OPENRAVE_LOCAL | |||
| #endif // OPENRAVE_DLL | #endif // OPENRAVE_DLL | |||
| #define OPENRAVE_VERSION_MAJOR 0 | #define OPENRAVE_VERSION_MAJOR 0 | |||
| #define OPENRAVE_VERSION_MINOR 6 | #define OPENRAVE_VERSION_MINOR 6 | |||
| #define OPENRAVE_VERSION_PATCH 4 | #define OPENRAVE_VERSION_PATCH 6 | |||
| #define OPENRAVE_VERSION_COMBINED(major, minor, patch) (((major) << 16) | ( (minor) << 8) | (patch)) | #define OPENRAVE_VERSION_COMBINED(major, minor, patch) (((major) << 16) | ( (minor) << 8) | (patch)) | |||
| #define OPENRAVE_VERSION OPENRAVE_VERSION_COMBINED(OPENRAVE_VERSION_MAJOR, OPENRAVE_VERSION_MINOR, OPENRAVE_VERSION_PATCH) | #define OPENRAVE_VERSION OPENRAVE_VERSION_COMBINED(OPENRAVE_VERSION_MAJOR, OPENRAVE_VERSION_MINOR, OPENRAVE_VERSION_PATCH) | |||
| #define OPENRAVE_VERSION_EXTRACT_MAJOR(version) (((version)>>16)&0xff) | #define OPENRAVE_VERSION_EXTRACT_MAJOR(version) (((version)>>16)&0xff) | |||
| #define OPENRAVE_VERSION_EXTRACT_MINOR(version) (((version)>>8)&0xff) | #define OPENRAVE_VERSION_EXTRACT_MINOR(version) (((version)>>8)&0xff) | |||
| #define OPENRAVE_VERSION_EXTRACT_PATCH(version) (((version))&0xff) | #define OPENRAVE_VERSION_EXTRACT_PATCH(version) (((version))&0xff) | |||
| #define OPENRAVE_VERSION_STRING "0.6.4" | #define OPENRAVE_VERSION_STRING "0.6.6" | |||
| #define OPENRAVE_VERSION_STRING_FORMAT(version) boost::str(boost::format("% s.%s.%s")%(OPENRAVE_VERSION_EXTRACT_MAJOR(version))%(OPENRAVE_VERSION_EXTRA CT_MINOR(version))%(OPENRAVE_VERSION_EXTRACT_PATCH(version))) | #define OPENRAVE_VERSION_STRING_FORMAT(version) boost::str(boost::format("% s.%s.%s")%(OPENRAVE_VERSION_EXTRACT_MAJOR(version))%(OPENRAVE_VERSION_EXTRA CT_MINOR(version))%(OPENRAVE_VERSION_EXTRACT_PATCH(version))) | |||
| #define OPENRAVE_VERSION_GE(major1, minor1, patch1, major2, minor2, patch2) (OPENRAVE_VERSION_COMBINED(major1, minor1, patch1) >= OPENRAVE_VERSION_COM BINED(major2, minor2, patch2)) | #define OPENRAVE_VERSION_GE(major1, minor1, patch1, major2, minor2, patch2) (OPENRAVE_VERSION_COMBINED(major1, minor1, patch1) >= OPENRAVE_VERSION_COM BINED(major2, minor2, patch2)) | |||
| #define OPENRAVE_VERSION_MINIMUM(major, minor, patch) OPENRAVE_VERSION_GE(O PENRAVE_VERSION_MAJOR, OPENRAVE_VERSION_MINOR, OPENRAVE_VERSION_PATCH, majo r, minor, patch) | #define OPENRAVE_VERSION_MINIMUM(major, minor, patch) OPENRAVE_VERSION_GE(O PENRAVE_VERSION_MAJOR, OPENRAVE_VERSION_MINOR, OPENRAVE_VERSION_PATCH, majo r, minor, patch) | |||
| // if 0, single precision | // if 0, single precision | |||
| // if 1, double precision | // if 1, double precision | |||
| #define OPENRAVE_PRECISION 1 | #define OPENRAVE_PRECISION 1 | |||
| #define OPENRAVE_PLUGINS_INSTALL_DIR "/home/andrey/upstream-tracker/testing | #define OPENRAVE_PLUGINS_INSTALL_DIR "/home/ut/testing/openrave/0.6.6/share | |||
| /openrave/0.6.4/share/openrave-0.6/plugins" | /openrave-0.6/plugins" | |||
| #define OPENRAVE_DATA_INSTALL_DIR "/home/andrey/upstream-tracker/testing/op | #define OPENRAVE_DATA_INSTALL_DIR "/home/ut/testing/openrave/0.6.6/share/op | |||
| enrave/0.6.4/share/openrave-0.6" | enrave-0.6" | |||
| #define OPENRAVE_PYTHON_INSTALL_DIR "/home/andrey/upstream-tracker/testing/ | #define OPENRAVE_PYTHON_INSTALL_DIR "/home/ut/testing/openrave/0.6.6/lib/py | |||
| openrave/0.6.4/lib/python2.7/site-packages" | thon2.7/site-packages" | |||
| #endif | #endif | |||
| End of changes. 3 change blocks. | ||||
| 8 lines changed or deleted | 8 lines changed or added | |||