- Timestamp:
- Mar 28, 2008, 4:35:39 PM (17 years ago)
- Location:
- code/branches/script
- Files:
-
- 5 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/script/CMakeLists.txt
r790 r946 71 71 FIND_PACKAGE(OggVorbis) 72 72 FIND_PACKAGE(ZLIB) 73 FIND_PACKAGE(Lua) 73 74 74 75 #Sets the search paths for the linking 75 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${Zlib_LIBRARY_DIR} core objects loader network weapon classHierarchy audio)76 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${Zlib_LIBRARY_DIR} ${Lua_LIBRARIES} core objects loader network weapon classHierarchy audio) 76 77 #Sets the search path for include files 77 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR} )78 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR} ${Lua_INCLUDE_DIR}) 78 79 79 80 #Set the execution directory -
code/branches/script/src/orxonox/CMakeLists.txt
r934 r946 32 32 objects/weapon/BulletManager.cc 33 33 objects/weapon/WeaponStation.cc 34 script/Script.cc 34 35 ) 35 36 … … 41 42 ${OGRE_LIBRARIES} 42 43 ${OIS_LIBRARIES} 44 ${Lua_LIBRARIES} 43 45 util 44 46 core -
code/branches/script/src/orxonox/InputHandler.cc
r934 r946 108 108 109 109 // If possible create a buffered keyboard 110 if (inputSystem_->numKeyboards() > 0)111 { 110 /*if (inputSystem_->getNumberOfDevices(OIS::OISKeyboard) > 0) 111 {*/ 112 112 keyboard_ = static_cast<OIS::Keyboard*>(inputSystem_->createInputObject(OIS::OISKeyboard, true)); 113 113 keyboard_->setEventCallback(this); 114 114 COUT(ORX_DEBUG) << "*** InputHandler: Created OIS mouse" << std::endl; 115 }115 //} 116 116 117 117 // If possible create a buffered mouse 118 if (inputSystem_->numMice() > 0 )119 { 118 /*if (inputSystem_->numMice() > 0 ) 119 {*/ 120 120 mouse_ = static_cast<OIS::Mouse*>(inputSystem_->createInputObject(OIS::OISMouse, true)); 121 121 mouse_->setEventCallback(this); … … 124 124 // Set mouse region 125 125 this->setWindowExtents(windowWidth, windowHeight); 126 }126 //} 127 127 } 128 128 catch (OIS::Exception ex)
Note: See TracChangeset
for help on using the changeset viewer.