Changeset 2664 for code/branches/buildsystem3/src/ois

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/ois/CMakeLists.txt (modified) (2 diffs)
• src/ois/OISException.cpp (modified) (1 diff)
• src/ois/OISException.h (modified) (1 diff)
• src/ois/VERSION (copied) (copied from code/branches/buildsystem2/src/ois/VERSION)
• src/ois/changes_orxonox.diff (copied) (copied from code/branches/buildsystem2/src/ois/changes_orxonox.diff)
• src/ois/linux/CMakeLists.txt (copied) (copied from code/branches/buildsystem2/src/ois/linux/CMakeLists.txt)
• src/ois/linux/LinuxKeyboard.cpp (modified) (4 diffs)
• src/ois/mac/CMakeLists.txt (copied) (copied from code/branches/buildsystem2/src/ois/mac/CMakeLists.txt)
• src/ois/win32/CMakeLists.txt (copied) (copied from code/branches/buildsystem2/src/ois/win32/CMakeLists.txt)

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

@@ -1 @@
-INCLUDE_DIRECTORIES(.)
+ #
+ #             ORXONOX - the hottest 3D action shooter ever to exist
+ #                             > www.orxonox.net <
+ #
+ #        This program is free software; you can redistribute it and/or
+ #         modify it under the terms of the GNU General Public License
+ #        as published by the Free Software Foundation; either version 2
+ #            of the License, or (at your option) any later version.
+ #
+ #       This program is distributed in the hope that it will be useful,
+ #        but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #                 GNU General Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #      with this program; if not, write to the Free Software Foundation,
+ #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #
 
-SET( OIS_SRC_FILES
+SET_SOURCE_FILES(OIS_FILES
+  OIS.h
+  OISConfig.h
+  OISEffect.h
+  OISEvents.h
+  OISException.h
+  OISFactoryCreator.h
+  OISForceFeedback.h
+  OISInputManager.h
+  OISInterface.h
+  OISJoyStick.h
+  OISKeyboard.h
+  OISMouse.h
+  OISObject.h
+  OISPrereqs.h
+
   OISEffect.cpp
   OISException.cpp
@@ -10 +42 @@
   OISObject.cpp
 )
+IF(WIN32)
+  ADD_SUBDIRECTORY(win32)
+ELSEIF(APPLE)
+  ADD_SUBDIRECTORY(mac)
+ELSEIF(UNIX)
+  ADD_SUBDIRECTORY(linux)
+ENDIF()
+
+GENERATE_SOURCE_GROUPS(${OIS_FILES})
+
+REMOVE_COMPILER_FLAGS("-DUNICODE -D_UNICODE" MSVC)
+INCLUDE_DIRECTORIES(.)
+
+ADD_LIBRARY(ois_orxonox SHARED ${OIS_FILES})
+SET_TARGET_PROPERTIES(ois_orxonox PROPERTIES DEFINE_SYMBOL "OIS_NONCLIENT_BUILD")
 
 IF(WIN32)
-  SET( OIS_SRC_FILES ${OIS_SRC_FILES}
-    win32/Win32ForceFeedback.cpp
-    win32/Win32InputManager.cpp
-    win32/Win32JoyStick.cpp
-    win32/Win32KeyBoard.cpp
-    win32/Win32Mouse.cpp
-  )
-ELSEIF (APPLE)
-  SET( OIS_SRC_FILES ${OIS_SRC_FILES}
-    mac/MacHelpers.cpp
-    mac/MacHIDManager.cpp
-    mac/MacInputManager.cpp
-    mac/MacKeyboard.cpp
-    mac/MacMouse.cpp
-  )
-ELSEIF (UNIX)
-  SET( OIS_SRC_FILES ${OIS_SRC_FILES}
-    linux/EventHelpers.cpp
-    linux/LinuxForceFeedback.cpp
-    linux/LinuxInputManager.cpp
-    linux/LinuxJoyStickEvents.cpp
-    linux/LinuxKeyboard.cpp
-    linux/LinuxMouse.cpp
-  )
-ENDIF (WIN32)
+  TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES})
+ENDIF()
 
-ADD_LIBRARY( ois_orxonox SHARED ${OIS_SRC_FILES} )
-
-IF(WIN32)
-  LINK_DIRECTORIES(${DirectX_LIB_DIR})
-  TARGET_LINK_LIBRARIES( ois_orxonox
-    dxguid
-    dinput8
-  )
-ENDIF(WIN32)
-
+ORXONOX_INSTALL(ois_orxonox)

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

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

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

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

code/branches/buildsystem3/src/ois/linux/LinuxKeyboard.cpp

@@ -283 +283 @@
         }
 
-        for(unsigned int i = 1; i < len; i++)
+        for(int i = 1; i < len; i++)
                 val = (val << 6) | (buf[i] & 0x3F);
 
@@ -303 +303 @@
 
         while( XPending(display) > 0 )
-        {
-                XNextEvent(display, &event);
-
-                if( KeyPress == event.type )
+        {               XNextEvent(display, &event);            if( KeyPress == event.type )
                 {
                         unsigned int character = 0;
@@ -335 +332 @@
                         if( event.xkey.state & Mod1Mask && key == XK_Tab )
                                 linMan->_setGrabState(false);
-                }
-                else if( KeyRelease == event.type )
+                }               else if( KeyRelease == event.type )
                 {
                         //Mask out the modifier states X sets.. or we will get improper values
@@ -344 +340 @@
                         //Else, it is a valid key release
                         XLookupString(&event.xkey,NULL,0,&key,NULL);
-                        _injectKeyUp(key);
-                }
+                        _injectKeyUp(key);              }
         }