Changeset 1502 for code/trunk/src/ois

Timestamp:

Jun 1, 2008, 3:54:20 PM (17 years ago)

Author:

rgrieder

Message:

• @everyone: Do not create a branch until I've added the svn:eol-style property correctly. Otherwise this would cost me another 4 hours or so when we want to merge back.
• merged network branch back to trunk
• I had to omit the changes from last evening concerning the line endings
• might not work yet because of the line endings
• @beni: script branch is the only branch still open. you probably will have to apply a patch because of inconsistent new lines

Location:

code/trunk/src/ois

Files:

• CMakeLists.txt (modified) (1 diff)
• OISException.cpp (modified) (1 diff)
• OISException.h (modified) (1 diff)

code/trunk/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/trunk/src/ois/OISException.cpp

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

code/trunk/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