From 723b84c79c91abc804380d921c91d850ab68ff0a Mon Sep 17 00:00:00 2001
From: Stefan Gartner <stefang@aon.at>
Date: Fri, 2 May 2003 13:36:56 +0000
Subject: 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
---
 source/blender/quicktime/apple/quicktime_import.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'source/blender/quicktime/apple/quicktime_import.c')

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__
-- 
cgit v1.2.3