diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/quicktime/quicktime_import.h | 1 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp | 10 | ||||
-rw-r--r-- | source/nan_definitions.mk | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h index 39434a92a85..f8fe178a04f 100644 --- a/source/blender/quicktime/quicktime_import.h +++ b/source/blender/quicktime/quicktime_import.h @@ -49,6 +49,7 @@ #ifdef _WIN32 #include <Movies.h> #elif defined(__APPLE__) +#import <Carbon/Carbon.h> #include <QuickTime/Movies.h> #endif #endif diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp index cd7fb7f2c45..cd37fbec502 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp @@ -110,32 +110,32 @@ static OSStatus bglInitEntryPoints (void) err = FindFolder (kSystemDomain, kFrameworksFolderType, false, &fileRefParam.ioVRefNum, &fileRefParam.ioDirID); if (noErr != err) { - DebugStr ("\pCould not find frameworks folder"); + DebugStr ((unsigned char *)"\pCould not find frameworks folder"); return err; } err = PBMakeFSRefSync (&fileRefParam); // make FSRef for folder if (noErr != err) { - DebugStr ("\pCould make FSref to frameworks folder"); + DebugStr ((unsigned char *)"\pCould make FSref to frameworks folder"); return err; } // create URL to folder bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault, &fileRef); if (!bundleURLOpenGL) { - DebugStr ("\pCould create OpenGL Framework bundle URL"); + DebugStr ((unsigned char *)"\pCould create OpenGL Framework bundle URL"); return paramErr; } // create ref to GL's bundle gBundleRefOpenGL = CFBundleCreate (kCFAllocatorDefault, bundleURLOpenGL); if (!gBundleRefOpenGL) { - DebugStr ("\pCould not create OpenGL Framework bundle"); + DebugStr ((unsigned char *)"\pCould not create OpenGL Framework bundle"); return paramErr; } CFRelease (bundleURLOpenGL); // release created bundle // if the code was successfully loaded, look for our function. if (!CFBundleLoadExecutable (gBundleRefOpenGL)) { - DebugStr ("\pCould not load MachO executable"); + DebugStr ((unsigned char *)"\pCould not load MachO executable"); return paramErr; } return err; diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 83eb5c27abc..a01aa0c77e3 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -139,7 +139,7 @@ endif export ID = $(shell whoami) export HOST = $(shell hostname -s) -# export PY_FRAMEWORK = 1 + export PY_FRAMEWORK = 1 ifdef PY_FRAMEWORK export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.3 |