Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 946 for code


Ignore:
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:
5 added
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/script/CMakeLists.txt

    r790 r946  
    7171FIND_PACKAGE(OggVorbis)
    7272FIND_PACKAGE(ZLIB)
     73FIND_PACKAGE(Lua)
    7374
    7475#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)
     76LINK_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)
    7677#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})
     78INCLUDE_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})
    7879
    7980#Set the execution directory
  • code/branches/script/src/orxonox/CMakeLists.txt

    r934 r946  
    3232  objects/weapon/BulletManager.cc
    3333  objects/weapon/WeaponStation.cc
     34  script/Script.cc
    3435)
    3536
     
    4142  ${OGRE_LIBRARIES}
    4243  ${OIS_LIBRARIES}
     44  ${Lua_LIBRARIES}
    4345  util
    4446  core
  • code/branches/script/src/orxonox/InputHandler.cc

    r934 r946  
    108108
    109109        // If possible create a buffered keyboard
    110         if (inputSystem_->numKeyboards() > 0)
    111         {
     110        /*if (inputSystem_->getNumberOfDevices(OIS::OISKeyboard) > 0)
     111        {*/
    112112          keyboard_ = static_cast<OIS::Keyboard*>(inputSystem_->createInputObject(OIS::OISKeyboard, true));
    113113          keyboard_->setEventCallback(this);
    114114          COUT(ORX_DEBUG) << "*** InputHandler: Created OIS mouse" << std::endl;
    115         }
     115        //}
    116116
    117117        // If possible create a buffered mouse
    118         if (inputSystem_->numMice() > 0 )
    119         {
     118        /*if (inputSystem_->numMice() > 0 )
     119        {*/
    120120          mouse_ = static_cast<OIS::Mouse*>(inputSystem_->createInputObject(OIS::OISMouse, true));
    121121          mouse_->setEventCallback(this);
     
    124124          // Set mouse region
    125125          this->setWindowExtents(windowWidth, windowHeight);
    126         }
     126        //}
    127127      }
    128128      catch (OIS::Exception ex)
Note: See TracChangeset for help on using the changeset viewer.