Changeset 8071 for code/branches/kicklib/src/external/ois/OISPrereqs.h

Timestamp:

Mar 14, 2011, 3:53:38 AM (13 years ago)

Author:

rgrieder

Message:

Merged ois_update branch (before it was renamed to mac_osx) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/external/ois/OISPrereqs.h (modified) (4 diffs)

code/branches/kicklib/src/external/ois/OISPrereqs.h

@@ -79 +79 @@
 #       endif
 #elif defined( __APPLE_CC__ ) // Apple OS X
-#       define OIS_APPLE_PLATFORM
-#       undef _OISExport
-#       define _OISExport __attribute__((visibility("default")))
+    // Device                                       Simulator
+#   if __IPHONE_OS_VERSION_MIN_REQUIRED >= 20201 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20000
+//#   if __IPHONE_OS_VERSION_MIN_REQUIRED >= 30000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 30000
+#       define OIS_IPHONE_PLATFORM
+#   else
+#       define OIS_APPLE_PLATFORM
+#   endif
+#   undef _OISExport
+#   define _OISExport __attribute__((visibility("default")))
 #else //Probably Linux
 #       define OIS_LINUX_PLATFORM
@@ -95 +101 @@
 //-------------- Common Classes, Enums, and Typdef's -------------------------//
 #define OIS_VERSION_MAJOR 1
-#define OIS_VERSION_MINOR 2 
+#define OIS_VERSION_MINOR 4
 #define OIS_VERSION_PATCH 0
-#define OIS_VERSION_NAME "Smash"
+#define OIS_VERSION_NAME "1.4.0"
 
 #define OIS_VERSION ((OIS_VERSION_MAJOR << 16) | (OIS_VERSION_MINOR << 8) | OIS_VERSION_PATCH)
@@ -110 +116 @@
         class Mouse;
         class JoyStick;
+    class MultiTouch;
         class KeyListener;
         class MouseListener;
+    class MultiTouchListener;
         class JoyStickListener;
         class Interface;
@@ -130 +138 @@
     enum Type
         {
-                OISUnknown   = 0,
-                OISKeyboard  = 1,
-                OISMouse     = 2,
-                OISJoyStick  = 3,
-                OISTablet    = 4
+                OISUnknown       = 0,
+                OISKeyboard      = 1,
+                OISMouse         = 2,
+                OISJoyStick      = 3,
+                OISTablet        = 4,
+                OISMultiTouch    = 5
         };