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
This commit is contained in:
2003-05-02 13:36:56 +00:00
parent 75014f9f64
commit 723b84c79c
16 changed files with 162 additions and 24 deletions

View File

@@ -0,0 +1,40 @@
#
# $Id$
#
# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. The Blender
# Foundation also sells licenses for use in proprietary software under
# the Blender License. See http://www.blender.org/BL/ for information
# about this.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
# All rights reserved.
#
# The Original Code is: all of this file.
#
# Contributor(s): none yet.
#
# ***** END GPL/BL DUAL LICENSE BLOCK *****
#
# Bounces make to subdirectories.
SOURCEDIR = source/blender/quicktime
ifeq ($(OS), $(findstring $(OS), "windows, darwin"))
DIRS = apple
endif
include nan_subdirs.mk

View File

@@ -0,0 +1,60 @@
#
# $Id$
#
# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. The Blender
# Foundation also sells licenses for use in proprietary software under
# the Blender License. See http://www.blender.org/BL/ for information
# about this.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
# All rights reserved.
#
# The Original Code is: all of this file.
#
# Contributor(s): none yet.
#
# ***** END GPL/BL DUAL LICENSE BLOCK *****
#
#
LIBNAME = blenderqt
DIR = $(OCGDIR)/blender/$(LIBNAME)
include nan_compile.mk
CFLAGS += $(LEVEL1_C_WARNINGS)
CPPFLAGS += -DWITH_QUICKTIME
ifeq ($(CPU),$(findstring $(CPU), "powerpc mips sparc"))
CPPFLAGS += -DWORDS_BIGENDIAN
else
# alpha i386
CPPFLAGS += -DWORDS_LITTLEENDIAN
endif
# path to the guarded memory allocator
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
# our own include
CPPFLAGS += -I..
# stuff needed by quicktime_[import|export].c
CPPFLAGS += -I../../readstreamglue -I../../imbuf/intern -I../../imbuf
CPPFLAGS += -I../../blenlib -I../../makesdna -I../../include -I../../avi
CPPFLAGS += -I../../blenkernel -I../../render/extern/include

View File

@@ -82,16 +82,18 @@ DONE:
#include "quicktime_export.h"
#include <Movies.h>
#include <QuicktimeComponents.h>
#ifdef _WIN32
#include <FixMath.h>
#include <QTML.h>
#include <TextUtils.h>
#include <Movies.h>
#include <QuicktimeComponents.h>
#endif /* _WIN32 */
#ifdef __APPLE__
#undef NDEBUG
#include <QuickTime/Movies.h>
#include <QuickTime/QuicktimeComponents.h>
#include <fcntl.h> /* open() */
#include <unistd.h> /* close() */
#include <sys/stat.h> /* file permissions */

View File

@@ -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__

View File

@@ -44,7 +44,11 @@
#include "../imbuf/IMB_imbuf_types.h"
#ifndef __MOVIES__
#ifdef _WIN32
#include <Movies.h>
#elif defined(__APPLE__)
#include <QuickTime/Movies.h>
#endif
#endif
#ifdef _WIN32