Browse Source

Fix use of BS_PLATFORM_APPLE instead of BS_PLATFORM_OSX

This commit replaces instances of BS_PLATFORM_APPLE (that does not
exist) with the correct name BS_PLATFORM_OSX, defined in
BsPlatformDefines.h.
Marc Legendre 9 years ago
parent
commit
8e4b67bc9b

+ 2 - 2
Source/BansheeGLRenderAPI/Include/BsGLPrerequisites.h

@@ -24,7 +24,7 @@
 #   include <GL/glew.h>
 #   include <GL/glu.h>
 #   define GL_GLEXT_PROTOTYPES
-#elif BS_PLATFORM == BS_PLATFORM_APPLE
+#elif BS_PLATFORM == BS_PLATFORM_OSX
 #   include <GL/glew.h>
 #   include <OpenGL/glu.h>
 #endif
@@ -101,4 +101,4 @@ namespace BansheeEngine
 	};
 
 	/** @} */
-}
+}

+ 2 - 2
Source/BansheeOISInput/Source/BsInputHandlerOIS.cpp

@@ -73,7 +73,7 @@ namespace BansheeEngine
 		pl.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE")));
 		pl.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND")));
 		pl.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE")));
-#elif defined BS_PLATFORM == BS_PLATFORM_LINUX || BS_PLATFORM == BS_PLATFORM_APPLE
+#elif defined BS_PLATFORM == BS_PLATFORM_LINUX || BS_PLATFORM == BS_PLATFORM_OSX
 		pl.insert(std::make_pair(std::string("x11_mouse_grab"), std::string("false")));
 		pl.insert(std::make_pair(std::string("x11_mouse_hide"), std::string("false")));
 		pl.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false")));
@@ -334,4 +334,4 @@ namespace BansheeEngine
 
 		return (ButtonCode)(BC_GAMEPAD_BTN1 + (joystickCode - 15));
 	}
-}
+}

+ 1 - 1
Source/BansheeUtility/Include/BsDynLib.h

@@ -27,7 +27,7 @@ namespace BansheeEngine
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )
 #    define DYNLIB_UNLOAD( a ) dlclose( a )
 
-#elif BS_PLATFORM == BS_PLATFORM_APPLE
+#elif BS_PLATFORM == BS_PLATFORM_OSX
 #    define DYNLIB_HANDLE void*
 #    define DYNLIB_LOAD( a ) mac_loadDylib( a )
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )

+ 2 - 2
Source/BansheeUtility/Include/BsPlatformDefines.h

@@ -51,7 +51,7 @@
 #if defined( __WIN32__ ) || defined( _WIN32 )
 #   define BS_PLATFORM BS_PLATFORM_WIN32
 #elif defined( __APPLE_CC__)
-#   define BS_PLATFORM BS_PLATFORM_APPLE
+#   define BS_PLATFORM BS_PLATFORM_OSX
 #else
 #   define BS_PLATFORM BS_PLATFORM_LINUX
 #endif
@@ -116,4 +116,4 @@
 #        define BS_THREADLOCAL __thread
 #	endif
 
-#endif
+#endif

+ 1 - 1
Source/BansheeUtility/Source/BsDynLib.cpp

@@ -96,7 +96,7 @@ namespace BansheeEngine
         // Free the buffer.
         LocalFree(lpMsgBuf);
         return ret;
-#elif BS_PLATFORM == BS_PLATFORM_LINUX || BS_PLATFORM == BS_PLATFORM_APPLE
+#elif BS_PLATFORM == BS_PLATFORM_LINUX || BS_PLATFORM == BS_PLATFORM_OSX
         return String(dlerror());
 #else
         return String("");

+ 5 - 5
Source/BansheeUtility/Source/BsPath.cpp

@@ -117,7 +117,7 @@ namespace BansheeEngine
 		default:
 #if BS_PLATFORM == BS_PLATFORM_WIN32
 			parseWindows(pathStr, numChars);
-#elif BS_PLATFORM == BS_PLATFORM_APPLE || BS_PLATFORM == BS_PLATFORM_LINUX
+#elif BS_PLATFORM == BS_PLATFORM_OSX || BS_PLATFORM == BS_PLATFORM_LINUX
 			parseUnix(pathStr, numChars);
 #else
 			static_assert(false, "Unsupported platform for path.");
@@ -139,7 +139,7 @@ namespace BansheeEngine
 		default:
 #if BS_PLATFORM == BS_PLATFORM_WIN32
 			parseWindows(pathStr, numChars);
-#elif BS_PLATFORM == BS_PLATFORM_APPLE || BS_PLATFORM == BS_PLATFORM_LINUX
+#elif BS_PLATFORM == BS_PLATFORM_OSX || BS_PLATFORM == BS_PLATFORM_LINUX
 			parseUnix(pathStr, numChars);
 #else
 			static_assert(false, "Unsupported platform for path.");
@@ -159,7 +159,7 @@ namespace BansheeEngine
 		default:
 #if BS_PLATFORM == BS_PLATFORM_WIN32
 			return buildWindows();
-#elif BS_PLATFORM == BS_PLATFORM_APPLE || BS_PLATFORM == BS_PLATFORM_LINUX
+#elif BS_PLATFORM == BS_PLATFORM_OSX || BS_PLATFORM == BS_PLATFORM_LINUX
 			return buildUnix();
 #else
 			static_assert(false, "Unsupported platform for path.");
@@ -179,7 +179,7 @@ namespace BansheeEngine
 		default:
 #if BS_PLATFORM == BS_PLATFORM_WIN32
 			return BansheeEngine::toString(buildWindows());
-#elif BS_PLATFORM == BS_PLATFORM_APPLE || BS_PLATFORM == BS_PLATFORM_LINUX
+#elif BS_PLATFORM == BS_PLATFORM_OSX || BS_PLATFORM == BS_PLATFORM_LINUX
 			return BansheeEngine::toString(buildUnix());
 #else
 			static_assert(false, "Unsupported platform for path.");
@@ -591,4 +591,4 @@ namespace BansheeEngine
 	{
 		pushDirectory(BansheeEngine::toWString(dir));
 	}
-}
+}