Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 28, 2008, 5:30:11 AM (16 years ago)
Author:
landauf
Message:

merged console branch into network branch

after several heavy troubles it compiles, but there is still a bug I couldn't fix: orxonox crashes as soon as one presses a key after opening the console… maybe someone else sees the problem?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/network/src/core/CMakeLists.txt

    r1413 r1446  
    22  BaseObject.cc
    33  ClassTreeMask.cc
    4   CommandExecutor.cc
    54  ConfigFileManager.cc
    65  ConfigValueContainer.cc
     
    1110  Identifier.cc
    1211  IdentifierDistributor.cc
    13   InputBuffer.cc
    1412  InputManager.cc
    1513  KeyBinder.cc
     14  OutputBuffer.cc
     15  InputBuffer.cc
     16  Shell.cc
     17  CommandExecutor.cc
     18  CommandEvaluation.cc
     19  ConsoleCommand.cc
     20  ArgumentCompletionFunctions.cc
     21  ConsoleCommandCompilation.cc
    1622  Language.cc
    1723  Loader.cc
     
    2632  Tickable.cc
    2733  XMLPort.cc
     34  TclThreadManager.cc
     35  IRC.cc
    2836  tolua/tolua_bind.cc
    2937)
     
    3745)
    3846
    39 ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
     47IF(WIN32)
     48  ADD_LIBRARY(core ${CORE_SRC_FILES})
     49ELSE(WIN32)
     50  ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
     51ENDIF(WIN32)
    4052
    4153TARGET_LINK_LIBRARIES(core
     
    4759  ois
    4860  util
     61  ${Boost_thread_LIBRARIES}
     62  ${Boost_filesystem_LIBRARIES}
    4963)
Note: See TracChangeset for help on using the changeset viewer.