diff options
| author | Chris Burt <desoto@exenex.com> | 2005-03-25 06:47:19 +0300 |
|---|---|---|
| committer | Chris Burt <desoto@exenex.com> | 2005-03-25 06:47:19 +0300 |
| commit | b9da61202bebd0e8e85df3acc2ddf04f0d9d7130 (patch) | |
| tree | b14c57b8966a9d9c812a092def9ac0e068f66eda | |
| parent | ea15126d7595c1309252798040d42f42b7d318fb (diff) | |
Since Cygwin isn't compatible with all of this fancy AVI codec business we
need to do a check to be sure that we're not attempting to compile AVI
codec related features on Cygwin.
Prior to Rob's commit today, this setting wasn't exposed to Cygwin by
default because it was hidden by a WITH_QUICKTIME ifdef but when Rob
cleaned up today he removed that and the WIN32 ifdef inspired Cygwin and
the free tools to try and compile these pieces. This resulted in an
undefined reference to get_avicodec_settings.
Rob: Please review this change to be sure its compatible with the rest of
your integration of the avicodec and quicktime. It seems to go flawlessly
here but without your OK I'm not comfortable making this permenant. I based
this modifcation on other instances of this check for FREE_WINDOWS so it
should be just fine.
As always if it breaks something blame Ton. :P
| -rw-r--r-- | source/blender/src/buttons_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 3b0a4db93cb..8e0aef6e45d 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -583,10 +583,10 @@ void do_render_panels(unsigned short event) get_qtcodec_settings(); #endif /* WITH_QUICKTIME */ } -#ifdef _WIN32 +#if defined (_WIN32) && !defined(FREE_WINDOWS) else get_avicodec_settings(); -#endif /* _WIN32 */ +#endif /* _WIN32 && !FREE_WINDOWS */ #endif /* _WIN32 || __APPLE__ */ break; |