Changeset 946

Timestamp:

Mar 28, 2008, 4:35:39 PM (17 years ago)

Author:

bknecht

Message:

trying to link lua into the project and start with creating an interface to lua. still does not compile. stupid cmake

Location:

code/branches/script

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindLua.cmake (added)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/InputHandler.cc (modified) (2 diffs)
• src/orxonox/script (added)
• src/orxonox/script/Script.cc (added)
• src/orxonox/script/Script.h (added)
• src/orxonox/script/tolua++.h (added)

code/branches/script/CMakeLists.txt

@@ -71 +71 @@
 FIND_PACKAGE(OggVorbis)
 FIND_PACKAGE(ZLIB)
+FIND_PACKAGE(Lua)
 
 #Sets the search paths for the linking
-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)
+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)
 #Sets the search path for include files
-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})
+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})
 
 #Set the execution directory

code/branches/script/src/orxonox/CMakeLists.txt

@@ -32 +32 @@
   objects/weapon/BulletManager.cc
   objects/weapon/WeaponStation.cc
+  script/Script.cc
 )
 
@@ -41 +42 @@
   ${OGRE_LIBRARIES}
   ${OIS_LIBRARIES}
+  ${Lua_LIBRARIES}
   util
   core

code/branches/script/src/orxonox/InputHandler.cc

@@ -108 +108 @@
 
         // If possible create a buffered keyboard
-        if (inputSystem_->numKeyboards() > 0)
-        {
+        /*if (inputSystem_->getNumberOfDevices(OIS::OISKeyboard) > 0)
+        {*/
           keyboard_ = static_cast<OIS::Keyboard*>(inputSystem_->createInputObject(OIS::OISKeyboard, true));
           keyboard_->setEventCallback(this);
           COUT(ORX_DEBUG) << "*** InputHandler: Created OIS mouse" << std::endl;
-        }
+        //}
 
         // If possible create a buffered mouse
-        if (inputSystem_->numMice() > 0 )
-        {
+        /*if (inputSystem_->numMice() > 0 )
+        {*/
           mouse_ = static_cast<OIS::Mouse*>(inputSystem_->createInputObject(OIS::OISMouse, true));
           mouse_->setEventCallback(this);
@@ -124 +124 @@
           // Set mouse region
           this->setWindowExtents(windowWidth, windowHeight);
-        }
+        //}
       }
       catch (OIS::Exception ex)