diff options
-rw-r--r-- | source/Makefile | 3 | ||||
-rw-r--r-- | source/blender/Makefile | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/Makefile | 4 | ||||
-rw-r--r-- | source/blender/quicktime/Makefile | 40 | ||||
-rw-r--r-- | source/blender/quicktime/apple/Makefile | 60 | ||||
-rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 8 | ||||
-rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 15 | ||||
-rw-r--r-- | source/blender/quicktime/quicktime_import.h | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/Makefile | 4 | ||||
-rw-r--r-- | source/blender/src/Makefile | 6 | ||||
-rw-r--r-- | source/blender/src/playanim.c | 6 | ||||
-rw-r--r-- | source/blender/src/usiblender.c | 7 | ||||
-rw-r--r-- | source/creator/Makefile | 4 | ||||
-rw-r--r-- | source/creator/creator.c | 15 | ||||
-rw-r--r-- | source/nan_definitions.mk | 3 | ||||
-rw-r--r-- | source/nan_link.mk | 3 |
16 files changed, 162 insertions, 24 deletions
diff --git a/source/Makefile b/source/Makefile index 399f7df6639..54dda35e617 100644 --- a/source/Makefile +++ b/source/Makefile @@ -133,6 +133,9 @@ PYPLAYERLIB ?= $(PYLIB) COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a COMLIB += $(NAN_PNG)/lib/libpng.a + ifeq ($(WITH_QUICKTIME), true) + COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a + endif PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a PULIB += $(NAN_MOTO)/lib/libmoto.a diff --git a/source/blender/Makefile b/source/blender/Makefile index 7ccb0f0c042..eb139d8d617 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -39,6 +39,10 @@ DIRS += writestreamglue readstreamglue writeblenfile readblenfile DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi DIRS += bpython makesdna src renderconverter +ifeq ($(WITH_QUICKTIME), true) + DIRS += quicktime +endif + DIR = $(OCGDIR)/blender SOURCEDIR = source/blender TESTDIRS = deflate streamglue diff --git a/source/blender/imbuf/intern/Makefile b/source/blender/imbuf/intern/Makefile index 1517a508cec..0cb0316524d 100644 --- a/source/blender/imbuf/intern/Makefile +++ b/source/blender/imbuf/intern/Makefile @@ -59,3 +59,7 @@ CPPFLAGS += -I../../makesdna # external interface of this module CPPFLAGS += -I.. +ifeq ($(WITH_QUICKTIME), true) + CPPFLAGS += -DWITH_QUICKTIME +endif + diff --git a/source/blender/quicktime/Makefile b/source/blender/quicktime/Makefile new file mode 100644 index 00000000000..c71ebc4325d --- /dev/null +++ b/source/blender/quicktime/Makefile @@ -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 diff --git a/source/blender/quicktime/apple/Makefile b/source/blender/quicktime/apple/Makefile new file mode 100644 index 00000000000..7910f25e10e --- /dev/null +++ b/source/blender/quicktime/apple/Makefile @@ -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 + + diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 7ca6875ea78..b88c72bfb54 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -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 */ 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__ diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h index 2a2e35fd671..070346413a1 100644 --- a/source/blender/quicktime/quicktime_import.h +++ b/source/blender/quicktime/quicktime_import.h @@ -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 diff --git a/source/blender/render/intern/source/Makefile b/source/blender/render/intern/source/Makefile index 458d26bf050..ff8fc1fceae 100644 --- a/source/blender/render/intern/source/Makefile +++ b/source/blender/render/intern/source/Makefile @@ -58,3 +58,7 @@ CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # not very neat: the rest of blender.. CPPFLAGS += -I../../../include +ifeq ($(WITH_QUICKTIME), true) + CPPFLAGS += -DWITH_QUICKTIME +endif + diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index faae6598263..a20c6e4db3d 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -104,3 +104,9 @@ ifeq ($(OS),linux) CPPFLAGS += -I/usr/src/MesaCVS/include endif endif + +ifeq ($(WITH_QUICKTIME),true) + CPPFLAGS += -I../quicktime + CPPFLAGS += -DWITH_QUICKTIME +endif + diff --git a/source/blender/src/playanim.c b/source/blender/src/playanim.c index 70232870b2b..061df8f7f46 100644 --- a/source/blender/src/playanim.c +++ b/source/blender/src/playanim.c @@ -51,10 +51,10 @@ #ifdef WITH_QUICKTIME #ifdef _WIN32 #include <QTML.h> -#endif /* _WIN32 */ -#if defined (_WIN32) || defined (__APPLE__) #include <Movies.h> -#endif /* _WIN32 || __APPLE__ */ +#elif defined(__APPLE__) +#include <QuickTime/Movies.h> +#endif /* __APPLE__ */ #endif /* WITH_QUICKTIME */ #include "PIL_time.h" diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 2b5f05c4be1..5a9d0797715 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -120,10 +120,11 @@ #include "quicktime_export.h" #ifdef _WIN32 #include <QTML.h> -#endif /* _WIN32 */ -#if defined (_WIN32) || defined (__APPLE__) #include <Movies.h> -#endif /* _WIN32 || __APPLE__ */ +#elif defined (__APPLE__) +#undef NDEBUG +#include <QuickTime/Movies.h> +#endif /* __APPLE__ */ #endif /* WITH_QUICKTIME */ /***/ 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 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 496f271f8c5..4f6e82275d4 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -145,6 +145,9 @@ all debug:: # Be paranoid regarding library creation (do not update archives) export NAN_PARANOID ?= true + # enable quicktime by default on OS X + export WITH_QUICKTIME ?= true + else ifeq ($(OS),freebsd) diff --git a/source/nan_link.mk b/source/nan_link.mk index 6a9ebded017..1006bf6d9dd 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -58,6 +58,9 @@ endif ifeq ($(OS),darwin) LLIBS += -lGLU -lGL LLIBS += -lz -framework Carbon -framework AGL + ifeq ($(WITH_QUICKTIME), true) + LLIBS += -framework QuickTime + endif LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries DBG_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries endif |