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/creator | |
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/creator')
-rw-r--r-- | source/creator/Makefile | 4 | ||||
-rw-r--r-- | source/creator/creator.c | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/source/creator/Makefile b/source/creator/Makefile index 9c754c74bbe..b5f9679c6e9 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -60,3 +60,7 @@ CPPFLAGS += -I../kernel/gen_system CPPFLAGS += -I../kernel/gen_messaging CPPFLAGS += -I$(NAN_BLENKEY)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include + +ifeq ($(WITH_QUICKTIME), true) + CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME +endif diff --git a/source/creator/creator.c b/source/creator/creator.c index 0564929fa19..851144d14bc 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -95,14 +95,13 @@ #endif #ifdef WITH_QUICKTIME -# ifdef _WIN32 -# include <QTML.h> -# endif /* _WIN32 */ -# if defined (_WIN32) || defined (__APPLE__) -# include <Movies.h> -# elif defined (__linux__) -# include <quicktime/lqt.h> -# endif /* __linux__ */ +#ifdef _WIN32 +#include <QTML.h> +#include <Movies.h> +#elif defined(__APPLE__) +#undef NDEBUG +#include <QuickTime/Movies.h> +#endif /* __APPLE__ */ #endif /* WITH_QUICKTIME */ // from buildinfo.c |