Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7381


Ignore:
Timestamp:
Sep 8, 2010, 3:54:18 PM (9 years ago)
Author:
rgrieder
Message:

Merely cosmetic changes.

Location:
code/branches/ipv6/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ipv6/src/CMakeLists.txt

    r7329 r7381  
    7373  ${CEGUI_INCLUDE_DIR}
    7474  #${ENET_INCLUDE_DIR}
    75   ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include
    7675  ${Boost_INCLUDE_DIRS}
    7776  ${POCO_INCLUDE_DIR}
     
    9291  ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
    9392  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
     93  ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include
    9494
    9595  # OrxonoxConfig.h
  • code/branches/ipv6/src/external/enet/CMakeLists.txt

    r7376 r7381  
    1919
    2020SET_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
     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
    3030
    3131COMPILATION_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
     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
    4141COMPILATION_END
    4242)
    4343
    44 INCLUDE_DIRECTORIES(include)
     44ADD_COMPILER_FLAGS("-DHAS_POLL -DHAS_FCNTL -DHAS_MSGHDR_FLAGS -DHAS_SOCKLEN_T")
    4545
    4646ORXONOX_ADD_LIBRARY(enet_orxonox
    47         ORXONOX_EXTERNAL
    48         VERSION 1.3.0
    49         SOURCE_FILES ${ENET_FILES}
     47    ORXONOX_EXTERNAL
     48    VERSION        1.3.0
     49    DEFINE_SYMBOL  "ENET_BUILDING_LIB"
     50    SOURCE_FILES   ${ENET_FILES}
    5051)
    51 
    52 ADD_DEFINITIONS(-DHAS_POLL -DHAS_FCNTL -DHAS_MSGHDR_FLAGS -DHAS_SOCKLEN_T)
Note: See TracChangeset for help on using the changeset viewer.