diff options
| author | Richard Linden <none@none> | 2013-01-04 16:46:25 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-04 16:46:25 -0800 |
| commit | 0d8f1077a62099915cb532dc354d0e450e3e6a79 (patch) | |
| tree | f76f43d025304bc6aa65d3f91663cac67a6715cc /indra/media_plugins | |
| parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
| parent | 7dbb8860373769dfca7d6c6588284866a1bf86a3 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index 24328202cb..eb18a3776f 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -28,18 +28,10 @@ #include "linden_common.h" -#include "llgl.h" - -#include "llplugininstance.h" -#include "llpluginmessage.h" -#include "llpluginmessageclasses.h" -#include "media_plugin_base.h" - -#if LL_QUICKTIME_ENABLED - #if defined(LL_DARWIN) #include <QuickTime/QuickTime.h> #elif defined(LL_WINDOWS) + #include "llwin32headers.h" #include "MacTypes.h" #include "QTML.h" #include "Movies.h" @@ -48,6 +40,17 @@ #include "QTLoadLibraryUtils.h" #endif +#include "llgl.h" + +#include "llplugininstance.h" +#include "llpluginmessage.h" +#include "llpluginmessageclasses.h" +#include "media_plugin_base.h" + +#if LL_QUICKTIME_ENABLED + + + // TODO: Make sure that the only symbol exported from this library is LLPluginInitEntryPoint //////////////////////////////////////////////////////////////////////////////// // |