- Timestamp:
- May 28, 2008, 1:12:45 AM (16 years ago)
- Location:
- code/branches/network
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network/CMakeLists.txt
r1415 r1445 74 74 FIND_PACKAGE(Lua) 75 75 FIND_PACKAGE(TCL) 76 FIND_PACKAGE(DirectX) 76 77 77 78 #Set the search paths for the linking … … 99 100 ${Lua_INCLUDE_DIR} 100 101 ${TCL_INCLUDE_PATH} 102 ${DirectX_INCLUDE_DIR} 103 ${ZLIB_INCLUDE_DIR} 101 104 ) 102 105 -
code/branches/network/cmake/FindZLIB.cmake
r790 r1445 58 58 ENDIF(EXISTS "../libs/ogre/Dependencies/lib/Release") 59 59 60 FIND_PATH(ZLIB_INCLUDE_DIR zlib.h 61 ../libs/ogre/Dependencies/include 62 ) 63 60 64 FIND_LIBRARY(ZLIB_LIBRARY 61 65 NAMES zlib … … 63 67 ) 64 68 65 IF(ZLIB_LIBRARY )69 IF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR) 66 70 MESSAGE(STATUS "Zlib was found.") 67 ELSE(ZLIB_LIBRARY )71 ELSE(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR) 68 72 MESSAGE(FATAL_ERROR "Zlib was NOT found.") 69 ENDIF(ZLIB_LIBRARY )73 ENDIF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR) 70 74 ENDIF(WIN32) -
code/branches/network/src/core/XMLPort.h
r1209 r1445 166 166 } 167 167 } 168 catch (ticpp::Exception& ex)168 catch (ticpp::Exception& ex) 169 169 { 170 170 COUT(1) << std::endl; … … 344 344 } 345 345 } 346 catch (ticpp::Exception& ex)346 catch (ticpp::Exception& ex) 347 347 { 348 348 COUT(1) << std::endl; -
code/branches/network/src/ois/CMakeLists.txt
r1219 r1445 37 37 38 38 ADD_LIBRARY( ois SHARED ${OIS_SRC_FILES} ) 39 40 IF(WIN32) 41 LINK_DIRECTORIES(${DirectX_LIB_DIR}) 42 TARGET_LINK_LIBRARIES( ois 43 dxguid 44 dinput8 45 ) 46 ENDIF(WIN32) 47 -
code/branches/network/src/ois/OISException.cpp
r1219 r1445 26 26 27 27 //----------------------------------------------------------------------------// 28 const char* Exception::what() const throw()28 /*const char* Exception::what() const throw() 29 29 { 30 30 return eText; 31 31 } 32 32 */ -
code/branches/network/src/ois/OISException.h
r1219 r1445 58 58 : eType(err), eLine(line), eFile(file), eText(str) {} 59 59 60 ~Exception() throw() {} 61 62 virtual const char* what() const throw(); 60 virtual const char* what() const throw() 61 { return eText; } 63 62 64 63 //! The type of exception raised
Note: See TracChangeset
for help on using the changeset viewer.