Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1445 for code


Ignore:
Timestamp:
May 28, 2008, 1:12:45 AM (16 years ago)
Author:
landauf
Message:

fixed some parts of the cmake-files to work with windows

Location:
code/branches/network
Files:
1 added
6 edited

Legend:

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

    r1415 r1445  
    7474FIND_PACKAGE(Lua)
    7575FIND_PACKAGE(TCL)
     76FIND_PACKAGE(DirectX)
    7677
    7778#Set the search paths for the linking
     
    99100  ${Lua_INCLUDE_DIR}
    100101  ${TCL_INCLUDE_PATH}
     102  ${DirectX_INCLUDE_DIR}
     103  ${ZLIB_INCLUDE_DIR}
    101104)
    102105
  • code/branches/network/cmake/FindZLIB.cmake

    r790 r1445  
    5858  ENDIF(EXISTS "../libs/ogre/Dependencies/lib/Release")
    5959
     60  FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
     61    ../libs/ogre/Dependencies/include
     62  )
     63
    6064  FIND_LIBRARY(ZLIB_LIBRARY
    6165    NAMES zlib
     
    6367  )
    6468
    65   IF(ZLIB_LIBRARY)
     69  IF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
    6670    MESSAGE(STATUS "Zlib was found.")
    67   ELSE(ZLIB_LIBRARY)
     71  ELSE(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
    6872    MESSAGE(FATAL_ERROR "Zlib was NOT found.")
    69   ENDIF(ZLIB_LIBRARY)
     73  ENDIF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
    7074ENDIF(WIN32)
  • code/branches/network/src/core/XMLPort.h

    r1209 r1445  
    166166                        }
    167167                    }
    168                     catch(ticpp::Exception& ex)
     168                    catch (ticpp::Exception& ex)
    169169                    {
    170170                        COUT(1) << std::endl;
     
    344344                        }
    345345                    }
    346                     catch(ticpp::Exception& ex)
     346                    catch (ticpp::Exception& ex)
    347347                    {
    348348                        COUT(1) << std::endl;
  • code/branches/network/src/ois/CMakeLists.txt

    r1219 r1445  
    3737
    3838ADD_LIBRARY( ois SHARED ${OIS_SRC_FILES} )
     39
     40IF(WIN32)
     41  LINK_DIRECTORIES(${DirectX_LIB_DIR})
     42  TARGET_LINK_LIBRARIES( ois
     43    dxguid
     44    dinput8
     45  )
     46ENDIF(WIN32)
     47
  • code/branches/network/src/ois/OISException.cpp

    r1219 r1445  
    2626
    2727//----------------------------------------------------------------------------//
    28 const char* Exception::what() const throw()
     28/*const char* Exception::what() const throw()
    2929{
    3030        return eText;
    3131}
    32 
     32*/
  • code/branches/network/src/ois/OISException.h

    r1219 r1445  
    5858                        : eType(err), eLine(line), eFile(file), eText(str) {}
    5959
    60                 ~Exception() throw() {}
    61 
    62                 virtual const char* what() const throw();
     60                virtual const char* what() const throw()
     61            { return eText; }
    6362
    6463                //! The type of exception raised
Note: See TracChangeset for help on using the changeset viewer.