[Orxonox-commit 3610] r8295 - code/branches/kicklib2/src/libraries/core

rgrieder at orxonox.net rgrieder at orxonox.net
Fri Apr 22 04:07:26 CEST 2011


Author: rgrieder
Date: 2011-04-22 04:07:25 +0200 (Fri, 22 Apr 2011)
New Revision: 8295

Modified:
   code/branches/kicklib2/src/libraries/core/DynLib.cc
Log:
Use our own platform macros

Modified: code/branches/kicklib2/src/libraries/core/DynLib.cc
===================================================================
--- code/branches/kicklib2/src/libraries/core/DynLib.cc	2011-04-22 01:39:14 UTC (rev 8294)
+++ code/branches/kicklib2/src/libraries/core/DynLib.cc	2011-04-22 02:07:25 UTC (rev 8295)
@@ -74,11 +74,11 @@
         // dlopen() does not add .so to the filename, like windows does for .dll
         if (name.substr(name.length() - 3, 3) != ".so")
            name += ".so";
-#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+#elif defined(ORXONOX_PLATFORM_APPLE)
         // dlopen() does not add .dylib to the filename, like windows does for .dll
         if (name.substr(name.length() - 6, 6) != ".dylib")
             name += ".dylib";
-#elif OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#elif defined(ORXONOX_PLATFORM_WINDOWS)
         // Although LoadLibraryEx will add .dll itself when you only specify the library name,
         // if you include a relative path then it does not. So, add it to be sure.
         if (name.substr(name.length() - 4, 4) != ".dll")




More information about the Orxonox-commit mailing list