Changeset 1445 for code/branches

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:

• CMakeLists.txt (modified) (2 diffs)
• cmake/FindDirectX.cmake (added)
• cmake/FindZLIB.cmake (modified) (2 diffs)
• src/core/XMLPort.h (modified) (2 diffs)
• src/ois/CMakeLists.txt (modified) (1 diff)
• src/ois/OISException.cpp (modified) (1 diff)
• src/ois/OISException.h (modified) (1 diff)

code/branches/network/CMakeLists.txt

@@ -74 +74 @@
 FIND_PACKAGE(Lua)
 FIND_PACKAGE(TCL)
+FIND_PACKAGE(DirectX)
 
 #Set the search paths for the linking
@@ -99 +100 @@
   ${Lua_INCLUDE_DIR}
   ${TCL_INCLUDE_PATH}
+  ${DirectX_INCLUDE_DIR}
+  ${ZLIB_INCLUDE_DIR}
 )
 

code/branches/network/cmake/FindZLIB.cmake

@@ -58 +58 @@
   ENDIF(EXISTS "../libs/ogre/Dependencies/lib/Release")
 
+  FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+    ../libs/ogre/Dependencies/include
+  )
+
   FIND_LIBRARY(ZLIB_LIBRARY
     NAMES zlib
@@ -63 +67 @@
   )
 
-  IF(ZLIB_LIBRARY)
+  IF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
     MESSAGE(STATUS "Zlib was found.")
-  ELSE(ZLIB_LIBRARY)
+  ELSE(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
     MESSAGE(FATAL_ERROR "Zlib was NOT found.")
-  ENDIF(ZLIB_LIBRARY)
+  ENDIF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
 ENDIF(WIN32)

code/branches/network/src/core/XMLPort.h

@@ -166 +166 @@
                         }
                     }
-                    catch(ticpp::Exception& ex)
+                    catch (ticpp::Exception& ex)
                     {
                         COUT(1) << std::endl;
@@ -344 +344 @@
                         }
                     }
-                    catch(ticpp::Exception& ex)
+                    catch (ticpp::Exception& ex)
                     {
                         COUT(1) << std::endl;

code/branches/network/src/ois/CMakeLists.txt

@@ -37 +37 @@
 
 ADD_LIBRARY( ois SHARED ${OIS_SRC_FILES} )
+
+IF(WIN32)
+  LINK_DIRECTORIES(${DirectX_LIB_DIR})
+  TARGET_LINK_LIBRARIES( ois
+    dxguid
+    dinput8
+  )
+ENDIF(WIN32)
+

code/branches/network/src/ois/OISException.cpp

@@ -26 +26 @@
 
 //----------------------------------------------------------------------------//
-const char* Exception::what() const throw()
+/*const char* Exception::what() const throw()
 {
         return eText;
 }
-
+*/

code/branches/network/src/ois/OISException.h

@@ -58 +58 @@
                         : eType(err), eLine(line), eFile(file), eText(str) {}
 
-                ~Exception() throw() {}
-
-                virtual const char* what() const throw();
+                virtual const char* what() const throw()
+            { return eText; }
 
                 //! The type of exception raised