Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2581


Ignore:
Timestamp:
Jan 8, 2009, 10:22:22 PM (15 years ago)
Author:
rgrieder
Message:

Three build fixes:

  • All ENet to ENET and ENet_LIBRARIES to ENET_LIBRARY
  • Added ugly quotes again in ConfigTardis.cmake

@x3n: If you have difficulties finding Ogre, try putting $ENV{OGRE_HOME} in ConfigMinGW.cmake between quotes, on one line with semicolons as separators.

Location:
code/branches/buildsystem2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2/cmake/ConfigMinGW.cmake

    r2579 r2581  
    4242  SET(ENV{ENETDIR}     ${MINGW_LIBRARY_DIR}/enet-1.1)
    4343  # ENet is linked statically, hence we need to add some windows dependencies
    44   SET(ENet_ADDITIONAL_LIBRARIES ws2_32 winmm)
     44  SET(ENET_ADDITIONAL_LIBRARIES ws2_32 winmm)
    4545  SET(ENV{ALUTDIR}     ${MINGW_LIBRARY_DIR}/freealut-1.1.0)
    4646  SET(ENV{OGGSDIR}     ${MINGW_LIBRARY_DIR}/libogg-1.1.3
  • code/branches/buildsystem2/cmake/ConfigPlatforms.cmake

    r2579 r2581  
    3131
    3232# Set some variables to default values that may be configured below
    33 SET(ENet_ADDITIONAL_LIBRARIES "")
     33SET(ENET_ADDITIONAL_LIBRARIES "")
    3434SET(ORXONOX_FPIC_FLAG "-fPIC")
    3535SET(LIBRARY_DEBUG_POSTFIX "_d")
    3636MARK_AS_ADVANCED(
    37   ENet_ADDITIONAL_LIBRARIES
     37  ENET_ADDITIONAL_LIBRARIES
    3838  ORXONOX_FPIC_FLAG
    3939  LIBRARY_DEBUG_POSTFIX
  • code/branches/buildsystem2/cmake/ConfigTardis.cmake

    r2579 r2581  
    1818
    1919  #SET(Boost_ADDITIONAL_VERSIONS "1.36")
    20   SET(BOOST_INCLUDEDIR /usr/pack/boost-1.34.1-sd/include)
    21   SET(BOOST_LIBRARYDIR /usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib)
    22   SET(ENV{CEGUIDIR}    /usr/pack/cegui-0.5.0-sd
    23                        /usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1)
    24   SET(ENV{ENETDIR}     /usr/pack/enet-2007-sd
    25                        /usr/pack/enet-2007-sd/i686-debian-linux3.1)
    26   SET(ENV{ALUTDIR}     /usr/pack/openal-0.0.8-cl
    27                        /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1)
    28   SET(ENV{OGGDIR}      /usr/pack/oggvorbis-1.0-ds
    29                        /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0)
    30   SET(ENV{VORBISDIR}   /usr/pack/oggvorbis-1.0-ds
    31                        /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0)
    32   SET(ENV{LUA_DIR}     /usr/pack/lua-5.0.3-sd
    33                        /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1)
    34   SET(ENV{OGRE_HOME}   /usr/pack/ogre-1.4.5-sd
    35                        /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1)
    36   SET(ENV{OPENALDIR}   /usr/pack/openal-0.0.8-cl
    37                        /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1)
    38   #SET(TCL_INCLUDE_PATH /usr/pack/tcltk-8.4.9.linux-mo/include)
     20  SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.34.1-sd/include")
     21  SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib")
     22  SET(ENV{CEGUIDIR}    "/usr/pack/cegui-0.5.0-sd;/usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1")
     23  SET(ENV{ENETDIR}     "/usr/pack/enet-2007-sd;/usr/pack/enet-2007-sd/i686-debian-linux3.1")
     24  SET(ENV{ALUTDIR}     "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
     25  SET(ENV{OGGDIR}      "/usr/pack/oggvorbis-1.0-ds;/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0")
     26  SET(ENV{VORBISDIR}   "/usr/pack/oggvorbis-1.0-ds;/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0")
     27  SET(ENV{LUA_DIR}     "/usr/pack/lua-5.0.3-sd;/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1")
     28  SET(ENV{OGRE_HOME}   "/usr/pack/ogre-1.4.5-sd;/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1")
     29  SET(ENV{OPENALDIR}   "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
     30  #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
    3931ENDIF (IS_TARDIS)
  • code/branches/buildsystem2/cmake/FindENet.cmake

    r2579 r2581  
    1515#                 > www.orxonox.net <
    1616
    17 FIND_PATH(ENet_INCLUDE_DIR enet/enet.h
     17FIND_PATH(ENET_INCLUDE_DIR enet/enet.h
    1818    PATHS
    1919    $ENV{ENETDIR}
     
    2222    PATH_SUFFIXES include
    2323)
    24 FIND_LIBRARY(ENet_LIBRARY_OPTIMIZED
     24FIND_LIBRARY(ENET_LIBRARY_OPTIMIZED
    2525    NAMES enet
    2626    PATHS
     
    3030    PATH_SUFFIXES lib
    3131)
    32 FIND_LIBRARY(ENet_LIBRARY_DEBUG
     32FIND_LIBRARY(ENET_LIBRARY_DEBUG
    3333    NAMES enet_${LIBRARY_DEBUG_POSTFIX}
    3434    PATHS
     
    4141# handle the QUIETLY and REQUIRED arguments and set ENET_FOUND to TRUE if
    4242# all listed variables are TRUE
    43 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ENet DEFAULT_MSG
    44     ENet_LIBRARY_OPTIMIZED
    45     ENet_INCLUDE_DIR
     43FIND_PACKAGE_HANDLE_STANDARD_ARGS(ENET DEFAULT_MSG
     44    ENET_LIBRARY_OPTIMIZED
     45    ENET_INCLUDE_DIR
    4646)
    4747
    4848# Set optimized and debug libraries
    49 HandleLibraryTypes(ENet ${ENet_ADDITIONAL_LIBRARIES})
     49HandleLibraryTypes(ENET ${ENET_ADDITIONAL_LIBRARIES})
    5050
    5151MARK_AS_ADVANCED(
    52     ENet_LIBRARY
    53     ENet_LIBRARY_OPTIMIZED
    54     ENet_LIBRARY_DEBUG
    55     ENet_INCLUDE_DIR
     52    ENET_LIBRARY
     53    ENET_LIBRARY_OPTIMIZED
     54    ENET_LIBRARY_DEBUG
     55    ENET_INCLUDE_DIR
    5656)
  • code/branches/buildsystem2/src/network/CMakeLists.txt

    r2579 r2581  
    2626TARGET_LINK_LIBRARIES( network
    2727  ${ZLIB_LIBRARY}
    28   ${ENet_LIBRARIES}
     28  ${ENET_LIBRARY}
    2929  ${Boost_THREAD_LIBRARY}
    3030  core
     
    4545    ${OGRE_LIBRARY}
    4646    network
    47     ${ENet_LIBRARY}
     47    ${ENET_LIBRARY}
    4848    ${ZLIB_LIBRARY}
    4949  )
Note: See TracChangeset for help on using the changeset viewer.