forked from bartvdbraak/blender
OSX: substitute all MAC_OS_X_VERSION defines with MAC_OS_X_VERSION_MIN_REQUIRED macros, to get more reliable version (api) covering
This commit is contained in:
parent
41bfb62b0f
commit
acc8c654fc
4
extern/glew/src/glew.c
vendored
4
extern/glew/src/glew.c
vendored
@ -93,7 +93,7 @@ void* dlGetProcAddress (const GLubyte* name)
|
||||
#include <string.h>
|
||||
#include <AvailabilityMacros.h>
|
||||
|
||||
#ifdef MAC_OS_X_VERSION_10_3
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_3
|
||||
|
||||
#include <dlfcn.h>
|
||||
|
||||
@ -142,7 +142,7 @@ void* NSGLGetProcAddress (const GLubyte *name)
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
#endif /* MAC_OS_X_VERSION_10_3 */
|
||||
#endif /* MAC_OS_X_VERSION_MIN_REQUIRED */
|
||||
#endif /* __APPLE__ */
|
||||
|
||||
/*
|
||||
|
@ -423,7 +423,7 @@ static GHOST_TKey convertKey(int rawCode, unichar recvChar, UInt16 keyAction)
|
||||
|
||||
|
||||
#pragma mark defines for 10.6 api not documented in 10.5
|
||||
#ifndef MAC_OS_X_VERSION_10_6
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
|
||||
enum {
|
||||
/* The following event types are available on some hardware on 10.5.2 and later */
|
||||
NSEventTypeGesture = 29,
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
#include <Cocoa/Cocoa.h>
|
||||
|
||||
#ifndef MAC_OS_X_VERSION_10_6
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
|
||||
//Use of the SetSystemUIMode function (64bit compatible)
|
||||
#include <Carbon/Carbon.h>
|
||||
#endif
|
||||
@ -58,7 +58,7 @@ extern "C" {
|
||||
extern void wm_draw_update(bContext *C);
|
||||
};*/
|
||||
@interface CocoaWindowDelegate : NSObject
|
||||
#ifdef MAC_OS_X_VERSION_10_6
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
|
||||
<NSWindowDelegate>
|
||||
#endif
|
||||
{
|
||||
@ -115,12 +115,12 @@ extern "C" {
|
||||
|
||||
- (void)windowDidResize:(NSNotification *)notification
|
||||
{
|
||||
#ifdef MAC_OS_X_VERSION_10_6
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
|
||||
//if (![[notification object] inLiveResize]) {
|
||||
//Send event only once, at end of resize operation (when user has released mouse button)
|
||||
#endif
|
||||
systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, associatedWindow);
|
||||
#ifdef MAC_OS_X_VERSION_10_6
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
|
||||
//}
|
||||
#endif
|
||||
/* Live resize ugly patch. Needed because live resize runs in a modal loop, not letting main loop run
|
||||
@ -913,7 +913,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
|
||||
* doesn't know view/window difference. */
|
||||
m_fullScreen = true;
|
||||
|
||||
#ifdef MAC_OS_X_VERSION_10_6
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
|
||||
//10.6 provides Cocoa functions to autoshow menu bar, and to change a window style
|
||||
//Hide menu & dock if needed
|
||||
if ([[m_window screen] isEqual:[[NSScreen screens] objectAtIndex:0]]) {
|
||||
@ -972,7 +972,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
|
||||
m_fullScreen = false;
|
||||
|
||||
//Exit fullscreen
|
||||
#ifdef MAC_OS_X_VERSION_10_6
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
|
||||
//Show again menu & dock if needed
|
||||
if ([[m_window screen] isEqual:[NSScreen mainScreen]]) {
|
||||
[NSApp setPresentationOptions:NSApplicationPresentationDefault];
|
||||
|
@ -35,7 +35,7 @@ namespace KDL {
|
||||
*/
|
||||
class Chain {
|
||||
private:
|
||||
#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
|
||||
#if !defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
|
||||
// Eigen allocator is needed for alignment of Eigen data types
|
||||
std::vector<Segment, Eigen::aligned_allocator<Segment> > segments;
|
||||
#else
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <map>
|
||||
#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
|
||||
#if !defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
|
||||
#include <Eigen/Core>
|
||||
#endif
|
||||
|
||||
@ -35,7 +35,7 @@ namespace KDL
|
||||
{
|
||||
//Forward declaration
|
||||
class TreeElement;
|
||||
#if !defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_5)
|
||||
#if !defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
|
||||
// Eigen allocator is needed for alignment of Eigen data types
|
||||
typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
|
||||
#else
|
||||
|
@ -87,7 +87,7 @@ void makeqtstring(struct RenderData *rd, char *string); //for playanim.c
|
||||
|
||||
|
||||
|
||||
#if (defined(USE_QTKIT) && defined(MAC_OS_X_VERSION_10_6) && __LP64__)
|
||||
#if (defined(USE_QTKIT) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 && __LP64__)
|
||||
//Include the quicktime codec types constants that are missing in QTKitDefines.h in 10.6 / 64bit
|
||||
enum {
|
||||
kRawCodecType = 'raw ',
|
||||
|
Loading…
Reference in New Issue
Block a user