fixed some compilation errors after the merge

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1021 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-12-11 01:16:45 +00:00
parent 8b8511e154
commit 82cddd1ed1
7 changed files with 28 additions and 3010 deletions
+4 -5
View File
@@ -21,14 +21,14 @@
#define UTILITEEXP_H
/**
* Used mainly on Windows for dynamic linked libraries (dll).
*/
* Used mainly on Windows for dynamic linked libraries (dll).
*/
#if defined(_WIN32)
#if defined(utilite_EXPORTS) || defined(utilite_qt_EXPORTS) || defined(utilite_audio_EXPORTS) || defined(utilite_cv_EXPORTS) || defined(utilite_cvqt_EXPORTS)
#if defined(rtabmap_utilite_EXPORTS)
#define UTILITE_EXP __declspec( dllexport )
#else
#define UTILITE_EXP __declspec( dllimport )
#endif
#endif
#else
#define UTILITE_EXP
#endif
@@ -44,4 +44,3 @@
#endif