diff options
| author | Stefan Gartner <stefang@aon.at> | 2003-05-02 17:36:56 +0400 |
|---|---|---|
| committer | Stefan Gartner <stefang@aon.at> | 2003-05-02 17:36:56 +0400 |
| commit | 723b84c79c91abc804380d921c91d850ab68ff0a (patch) | |
| tree | 08b39407dc10793bf74ee5556f9cd25e0dfab123 /source/blender/quicktime/apple/quicktime_import.c | |
| parent | 75014f9f64a1fdde4e1f94d6962e99dea0dcb548 (diff) | |
fun with quicktime:
#include <QuickTime/Movies.h> instead of #include <Movies.h> on OS X to
avoid having to specify the full path to the QT headers in the Makefiles
#undef NDEBUG on OS X to avoid errors about ID being declared twice
enable support for QuickTime in the original Makefiles on OS X
Diffstat (limited to 'source/blender/quicktime/apple/quicktime_import.c')
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index 61c4fcec215..c961472318b 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -37,16 +37,17 @@ #include "IMB_anim.h" #include "BLO_sys_types.h" -#include <Movies.h> +#ifdef __APPLE__ +#include <QuickTime/Movies.h> +#include <QuickTime/QuickTimeComponents.h> +#endif #ifdef _WIN32 +#include <Movies.h> #include <QTML.h> -#include <TextUtils.h> -#endif /* _WIN32 */ - -//#ifdef __APPLE__ +#include <TextUtils.h> #include <QuickTimeComponents.h> -//#endif /* __APPLE__ */ +#endif /* _WIN32 */ #include "quicktime_import.h" @@ -81,7 +82,7 @@ int anim_is_quicktime (char *name) BLI_testextensie(name, ".zip") || BLI_testextensie(name, ".mp3")) return 0; - if(QTIME_DEBUG) printf("qt: checking as movie %s\n"); + if(QTIME_DEBUG) printf("qt: checking as movie\n"); sprintf(theFullPath, "%s", name); #ifdef __APPLE__ |