Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7329


Ignore:
Timestamp:
Sep 3, 2010, 12:28:15 AM (14 years ago)
Author:
adrfried
Message:

compile with own libenet

Location:
code/branches/ipv6
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • code/branches/ipv6/cmake/LibraryConfig.cmake

    r7243 r7329  
    9494
    9595FIND_PACKAGE(OGRE  1.4       REQUIRED)
    96 FIND_PACKAGE(ENet  1.1       REQUIRED)
     96#FIND_PACKAGE(ENet  1.1       REQUIRED)
    9797FIND_PACKAGE(Ogg             REQUIRED)
    9898FIND_PACKAGE(Vorbis          REQUIRED)

  • code/branches/ipv6/src/CMakeLists.txt

    r7224 r7329  
    7272  ${OGRE_INCLUDE_DIR}
    7373  ${CEGUI_INCLUDE_DIR}
    74   ${ENET_INCLUDE_DIR}
     74  #${ENET_INCLUDE_DIR}
     75  ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include
    7576  ${Boost_INCLUDE_DIRS}
    7677  ${POCO_INCLUDE_DIR}

  • code/branches/ipv6/src/external/CMakeLists.txt

    r7266 r7329  
    3434ADD_SUBDIRECTORY(bullet)
    3535ADD_SUBDIRECTORY(cpptcl)
     36ADD_SUBDIRECTORY(enet)
    3637ADD_SUBDIRECTORY(loki)
    3738ADD_SUBDIRECTORY(ogreceguirenderer)

  • code/branches/ipv6/src/external/enet/CMakeLists.txt

    r7328 r7329  
    1818 #
    1919
    20 ################ Sub Directories ################
     20SET_SOURCE_FILES(ENET_FILES
     21        include/enet/callbacks.h
     22        include/enet/enet.h
     23        include/enet/list.h
     24        include/enet/protocol.h
     25        include/enet/time.h
     26        include/enet/types.h
     27        include/enet/unix.h
     28        include/enet/utility.h
     29        #include/enet/win32.h
    2130
    22 ADD_SUBDIRECTORY(tolua)
     31COMPILATION_BEGIN ENetCompilation.cpp
     32        callbacks.c
     33        compress.c
     34        host.c
     35        list.c
     36        packet.c
     37        peer.c
     38        protocol.c
     39        unix.c
     40        #win32.c
     41COMPILATION_END
     42)
    2343
    24 # Include CEGUILua if not requested otherwise
    25 IF(CEGUILUA_USE_INTERNAL_LIBRARY)
    26   IF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua/ceguilua-${CEGUI_VERSION})
    27     MESSAGE(FATAL_ERROR "CEGUILua version not found in src folder. Update list of supported versions in LibraryConfig.cmake!")
    28   ENDIF()
     44INCLUDE_DIRECTORIES(include)
    2945
    30   ADD_SUBDIRECTORY(ceguilua)
    31   SET(CEGUILUA_LIBRARY ${CEGUILUA_LIBRARY} PARENT_SCOPE)
    32 ENDIF()
     46ORXONOX_ADD_LIBRARY(enet_orxonox
     47        ORXONOX_EXTERNAL
     48        VERSION 1.3.0
     49        SOURCE_FILES ${ENET_FILES}
     50)
    3351
    34 ADD_SUBDIRECTORY(bullet)
    35 ADD_SUBDIRECTORY(cpptcl)
    36 ADD_SUBDIRECTORY(loki)
    37 ADD_SUBDIRECTORY(ogreceguirenderer)
    38 ADD_SUBDIRECTORY(ois)
    39 ADD_SUBDIRECTORY(tinyxml)
     52SET_TARGET_PROPERTIES(enet_orxonox PROPERTIES DEFINE_SYMBOL "HAS_POLL")
     53SET_TARGET_PROPERTIES(enet_orxonox PROPERTIES DEFINE_SYMBOL "HAS_FCNTL")
     54SET_TARGET_PROPERTIES(enet_orxonox PROPERTIES DEFINE_SYMBOL "HAS_MSGHDR_FLAGS")
     55SET_TARGET_PROPERTIES(enet_orxonox PROPERTIES DEFINE_SYMBOL "HAS_SOCKLEN_T")

  • code/branches/ipv6/src/libraries/network/CMakeLists.txt

    r7163 r7329  
    7171  LINK_LIBRARIES
    7272    ${ZLIB_LIBRARY}
    73     ${ENET_LIBRARY}
     73    #${ENET_LIBRARY}
     74    enet_orxonox
    7475    ${Boost_THREAD_LIBRARY}
    7576    util
Note: See TracChangeset for help on using the changeset viewer.