i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-03 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged Audio branch to trunk

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@560 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-06-24 17:19:34 +00:00
parent 06fb556e78
commit 17b8e10ed8
111 changed files with 8370 additions and 9779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/CMakeLists.txt
View File

@@ -13,6 +13,8 @@ SET(SRC_FILES
)
SET(INCLUDE_DIRS
${PROJECT_SOURCE_DIR}/corelib/include
${PROJECT_SOURCE_DIR}/guilib/include
${CMAKE_CURRENT_SOURCE_DIR}
${UTILITE_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
@@ -58,7 +60,7 @@ IF(APPLE AND BUILD_AS_BUNDLE)
ELSE()
ADD_EXECUTABLE(main_app WIN32 ${SRC_FILES})
ENDIF()
TARGET_LINK_LIBRARIES(main_app corelib guilib ${LIBRARIES})
TARGET_LINK_LIBRARIES(main_app rtabmap_corelib rtabmap_guilib ${LIBRARIES})
IF(APPLE AND BUILD_AS_BUNDLE)
SET_TARGET_PROPERTIES(main_app PROPERTIES

3
app/src/main.cpp
View File

@@ -44,8 +44,7 @@ int main(int argc, char* argv[])
/* Add handlers to the EventsManager */
UEventsManager::addHandler(mainWindow);
UEventsManager::removeHandler(rtabmap); // Force removing for rtabmap to be the last.. FIXME: Rtabmap object should not register to EventsManager in its constructor...
UEventsManager::addHandler(rtabmap); //thread
UEventsManager::addHandler(rtabmap);
/* Start thread's task */
mainWindow->showNormal();