[Orxonox-commit 2433] r7142 - in code/branches/presentation3/src: . external/ois

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-06-10 11:48:59 +0200 (Thu, 10 Jun 2010)
New Revision: 7142

Modified:
   code/branches/presentation3/src/CMakeLists.txt
   code/branches/presentation3/src/external/ois/CMakeLists.txt
   code/branches/presentation3/src/external/ois/OISPrereqs.h
   code/branches/presentation3/src/external/ois/changes_orxonox.diff
Log:
Changed default linking behaviour of OIS to dynamic. That causes less confusions because all other libraries link dynamically per default (or don't require any macros because there is no DLL interface).

Modified: code/branches/presentation3/src/CMakeLists.txt
===================================================================
--- code/branches/presentation3/src/CMakeLists.txt	2010-06-10 02:14:17 UTC (rev 7141)
+++ code/branches/presentation3/src/CMakeLists.txt	2010-06-10 09:48:59 UTC (rev 7142)
@@ -39,7 +39,6 @@
 ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)
 ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
 ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA_DYNAMIC)
-ADD_COMPILER_FLAGS("-DOIS_DYNAMIC_LIB")
 ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
 # If no defines are specified, these libs get linked dynamically
 ADD_COMPILER_FLAGS("-DCEGUI_STATIC"       WIN32 NOT LINK_CEGUI_DYNAMIC)

Modified: code/branches/presentation3/src/external/ois/CMakeLists.txt
===================================================================
--- code/branches/presentation3/src/external/ois/CMakeLists.txt	2010-06-10 02:14:17 UTC (rev 7141)
+++ code/branches/presentation3/src/external/ois/CMakeLists.txt	2010-06-10 09:48:59 UTC (rev 7142)
@@ -56,7 +56,7 @@
 ORXONOX_ADD_LIBRARY(ois_orxonox
   ORXONOX_EXTERNAL
   DEFINE_SYMBOL
-    shared "OIS_NONCLIENT_BUILD" static "OIS_STATIC"
+    shared "OIS_NONCLIENT_BUILD" static "OIS_STATIC_LIB"
   VERSION
     1.2
   SOURCE_FILES

Modified: code/branches/presentation3/src/external/ois/OISPrereqs.h
===================================================================
--- code/branches/presentation3/src/external/ois/OISPrereqs.h	2010-06-10 02:14:17 UTC (rev 7141)
+++ code/branches/presentation3/src/external/ois/OISPrereqs.h	2010-06-10 09:48:59 UTC (rev 7142)
@@ -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)

Modified: code/branches/presentation3/src/external/ois/changes_orxonox.diff
===================================================================
--- code/branches/presentation3/src/external/ois/changes_orxonox.diff	2010-06-10 02:14:17 UTC (rev 7141)
+++ code/branches/presentation3/src/external/ois/changes_orxonox.diff	2010-06-10 09:48:59 UTC (rev 7142)
@@ -1,3 +1,14 @@
+--- 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)
 @@ -35,6 +35,20 @@