Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 536


Ignore:
Timestamp:
Dec 16, 2007, 12:57:38 AM (17 years ago)
Author:
landauf
Message:

adjustments for windows

Location:
code/branches/FICN
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/cmake/FindALUT.cmake

    r409 r536  
    4040  /opt/include/OpenAL
    4141  /opt/include
     42  ../libs/freealut-1.1.0/include
    4243  )
    4344# I'm not sure if I should do a special casing for Apple. It is
    … …  
    6970    $ENV{ALUTDIR}/lib
    7071    $ENV{ALUTDIR}/libs
    71                 /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
     72    /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
    7273    /usr/local/lib
    7374    /usr/lib
    … …  
    7677    /opt/csw/lib
    7778    /opt/lib
     79    ../libs/freealut-1.1.0/src/.libs
     80    ../libs/freealut-1.1.0/lib
    7881    )
    7982ENDIF(${ALUT_INCLUDE_DIR} MATCHES ".framework")

  • code/branches/FICN/cmake/FindBoost.cmake

    r418 r536  
    7676# a library is selected for linking.
    7777  SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
     78#  SET(Boost_LIB_PREFIX "lib")
     79#  SET(Boost_LIB_SUFFIX "gcc-mt-1_33_1.lib")
    7880ENDIF(WIN32)
    7981
    … …  
    109111# Look for an installation.
    110112#
    111 FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS
     113IF(WIN32)
     114  SET(Boost_INCLUDE_DIR ../libs/boost_1_33_1)
     115ELSE(WIN32)
     116  FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS
    112117
    113118# Look in other places.
    114   ${BOOST_DIR_SEARCH}
     119    ${BOOST_DIR_SEARCH}
    115120
    116121# Help the user find it if we cannot.
    117   DOC "The ${BOOST_INCLUDE_PATH_DESCRIPTION}"
    118 )
     122    DOC "The ${BOOST_INCLUDE_PATH_DESCRIPTION}"
     123  )
     124ENDIF(WIN32)
    119125
    120126# Assume we didn't find it.
    … …  
    140146  IF(EXISTS "${Boost_LIBRARY_DIR}/lib")
    141147    SET (Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/lib)
     148  ELSEIF(EXISTS "${Boost_LIBRARY_DIR}/bin/boost/libs/thread/build/boost_thread.dll/gcc/release/threading-multi")
     149    SET (Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/bin/boost/libs/thread/build/boost_thread.dll/gcc/release/threading-multi)
    142150  ELSE(EXISTS "${Boost_LIBRARY_DIR}/lib")
    143151    IF(EXISTS "${Boost_LIBRARY_DIR}/stage/lib")
    … …  
    152160  ENDIF(EXISTS "${Boost_LIBRARY_DIR}/lib")
    153161
     162
    154163  IF(EXISTS "${Boost_INCLUDE_DIR}")
    155164    SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
    … …  
    165174ENDIF(Boost_INCLUDE_DIR)
    166175
     176
    167177#
    168178# Find boost libraries
    … …  
    175185  gcc
    176186  il
     187  gcc-1_33_1
     188  gcc-mt-1_33_1
    177189)
    178190

  • code/branches/FICN/cmake/FindCEGUI.cmake

    r144 r536  
    2222IF (WIN32) #Windows
    2323    MESSAGE(STATUS "Looking for CEGUI")
    24     SET(CEGUI_INCLUDE_DIR ../ogre/Dependencies/include/CEGUI)
    25     SET(CEGUI_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release/lib)
     24    SET(CEGUI_INCLUDE_DIR ../libs/ogre/Dependencies/include/CEGUI)
     25    SET(CEGUI_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release/lib)
    2626    SET(CEGUI_LIBRARIES debug CEGUIBase_d optimized CEGUIBase)
    2727ELSE (WIN32) #Unix

  • code/branches/FICN/cmake/FindCEGUI_OGRE.cmake

    r144 r536  
    2222IF (WIN32) #Windows
    2323    MESSAGE(STATUS "Looking for CEGUI_OGRE")
    24     SET(CEGUI_OGRE_INCLUDE_DIR ../ogre/Samples/Common/CEGUIRenderer/include)
    25     SET(CEGUI_OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release/lib)
     24    SET(CEGUI_OGRE_INCLUDE_DIR ../libs/ogre/Samples/Common/CEGUIRenderer/include)
     25    SET(CEGUI_OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release/lib)
    2626    SET(CEGUI_OGRE_LIBRARIES debug OgreGUIRenderer_d optimized OgreGUIRenderer)
    2727ELSE (WIN32) #Unix

  • code/branches/FICN/cmake/FindENet.cmake

    r337 r536  
    1919    /usr/local/include
    2020    /usr/pack/enet-2007-sd/include
     21    ../libs/enet-1.1/include
    2122    )
    2223
    … …  
    2425    NAMES enet
    2526    PATHS /usr/lib /usr/local/lib /usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/
     27    ../libs/enet-1.1
    2628    )
    2729

  • code/branches/FICN/cmake/FindOGRE.cmake

    r135 r536  
    1818IF (WIN32) #Windows
    1919    MESSAGE(STATUS "Looking for OGRE")
    20     SET(OGRE_INCLUDE_DIR ../ogre/OgreMain/include)
    21     SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release)
     20    SET(OGRE_INCLUDE_DIR ../libs/ogre/OgreMain/include)
     21    SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
    2222    SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
    2323ELSE (WIN32) #Unix

  • code/branches/FICN/cmake/FindOIS.cmake

    r135 r536  
    2222IF (WIN32) #Windows
    2323    MESSAGE(STATUS "Looking for OIS")
    24     SET(OIS_INCLUDE_DIR ../ogre/Dependencies/include)
    25     SET(OIS_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release)
     24    SET(OIS_INCLUDE_DIR ../libs/ogre/Dependencies/include)
     25    SET(OIS_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/ogre/Samples/Common/bin/Release)
    2626    SET(OIS_LIBRARIES debug OIS_d optimized OIS)
    2727ELSE (WIN32) #Unix

  • code/branches/FICN/cmake/FindOggVorbis.cmake

    r409 r536  
    1717  /opt/csw/include
    1818  /opt/include
     19  ../libs/libogg-1.1.3/include
    1920  )
    2021
    … …  
    2829  /opt/csw/include
    2930  /opt/include
     31  ../libs/libvorbis-1.2.0/include
    3032  )
    3133
    … …  
    3739  NAMES ogg
    3840  PATHS
    39         /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
     41  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
    4042  /usr/local/lib
    4143  /usr/lib
    … …  
    4446  /opt/csw/lib
    4547  /opt/lib
     48  ../libs/libogg-1.1.3/src/.libs
    4649  )
    4750
    … …  
    4952  NAMES vorbis
    5053  PATHS
    51         /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
     54  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
    5255  /usr/local/lib
    5356  /usr/lib
    … …  
    5659  /opt/csw/lib
    5760  /opt/lib
     61  ../libs/libvorbis-1.2.0/lib/.libs
    5862  )
    5963
    … …  
    6165  NAMES vorbisenc
    6266  PATHS
    63         /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
     67  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
    6468  /usr/local/lib
    6569  /usr/lib
    … …  
    6872  /opt/csw/lib
    6973  /opt/lib
     74  ../libs/libvorbis-1.2.0/lib/.libs
    7075  )
    7176
    … …  
    7378  NAMES vorbisfile
    7479  PATHS
    75         /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
     80  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
    7681  /usr/local/lib
    7782  /usr/lib
    … …  
    8085  /opt/csw/lib
    8186  /opt/lib
     87  ../libs/libvorbis-1.2.0/lib/.libs
    8288  )
    8389

  • code/branches/FICN/cmake/FindOpenAL.cmake

    r409 r536  
    4141  /opt/include/OpenAL
    4242  /opt/include
     43  ../libs/openal-0.0.8/common/include
    4344  )
    4445# I'm not sure if I should do a special casing for Apple. It is
    … …  
    7071    $ENV{OPENALDIR}/lib
    7172    $ENV{OPENALDIR}/libs
    72                 /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
     73    /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
    7374    /usr/local/lib
    7475    /usr/lib
    … …  
    7778    /opt/csw/lib
    7879    /opt/lib
     80    ../libs/openal-0.0.8/src/.libs
    7981    )
    8082ENDIF(${OPENAL_INCLUDE_DIR} MATCHES ".framework")

  • code/branches/FICN/src/audio/CMakeLists.txt

    r486 r536  
    1414ADD_LIBRARY(audio ${SRC_FILES})
    1515
    16 TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
     16TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY})
    1717
    1818

  • code/branches/FICN/src/network/dummyclient3.cc

    r459 r536  
    33#include "PacketManager.h"
    44#include "Client.h"
     5
     6#ifdef WIN32
     7#include <windows.h>
     8#define usleep(x) Sleep((x)/1000)
     9#else
     10#include <unistd.h>
     11#endif
    512
    613using namespace network;
Note: See TracChangeset for help on using the changeset viewer.