Changeset 1445 for code/branches/network/src

Timestamp:

May 28, 2008, 1:12:45 AM (17 years ago)

Author:

landauf

Message:

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

Location:

code/branches/network/src

Files:

• core/XMLPort.h (modified) (2 diffs)
• ois/CMakeLists.txt (modified) (1 diff)
• ois/OISException.cpp (modified) (1 diff)
• ois/OISException.h (modified) (1 diff)

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