Changeset 7163 for code/trunk/src/external/ois

Timestamp:

Aug 11, 2010, 8:55:13 AM (14 years ago)

Author:

dafrick

Message:

Merged presentation3 branch into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/external/ois/OISPrereqs.h (modified) (1 diff)
• src/external/ois/changes_orxonox.diff (modified) (1 diff)

code/trunk/src/external/ois/OISPrereqs.h

@@ -61 +61 @@
 #       else
 #               define OIS_WIN32_PLATFORM
-#               if defined( OIS_DYNAMIC_LIB )
+#               if !defined( OIS_STATIC_LIB )
 #                       undef _OISExport
                         //Ignorable Dll interface warning...

code/trunk/src/external/ois/changes_orxonox.diff

@@ +1 @@
+--- OISPrereqs.h        (revision 7141)
++++ OISPrereqs.h        (working copy)
+@@ -60,7 +60,7 @@
+ #              define OIS_XBOX_PLATFORM
+ #      else
+ #              define OIS_WIN32_PLATFORM
+-#              if defined( OIS_DYNAMIC_LIB )
++#              if !defined( OIS_STATIC_LIB )
+ #                      undef _OISExport
+                        //Ignorable Dll interface warning...
+ #           if !defined(OIS_MINGW_COMPILER)
 --- linux/EventHelpers.cpp      (revision 5668)
 +++ linux/EventHelpers.cpp      (working copy)