Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2006-04-05 16:03:43 +0400
committerTon Roosendaal <ton@blender.org>2006-04-05 16:03:43 +0400
commit666120ad9aaf34df072303f02a4d2491f45ef480 (patch)
tree9b0822efedc359b3a5c35d60b7d6d57a28f87e1b
parentf3d8d8e06732ba8d023d958fbe2c64bf6888fae8 (diff)
Another #define __CARBONSOUND__ needed because of wacko Quicktime decision
to leave carbon framework in bad state.
-rw-r--r--source/blender/quicktime/quicktime_import.h1
-rw-r--r--source/blender/src/ghostwinlay.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h
index f8fe178a04f..58f20e4bf16 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__)
+#define __CARBONSOUND__
#import <Carbon/Carbon.h>
#include <QuickTime/Movies.h>
#endif
diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c
index e28b604935a..207ab2c27d2 100644
--- a/source/blender/src/ghostwinlay.c
+++ b/source/blender/src/ghostwinlay.c
@@ -62,6 +62,7 @@
#ifdef __APPLE__
#include <OpenGL/OpenGL.h>
+#define __CARBONSOUND__
#include <Carbon/Carbon.h>
/*declarations*/