[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11601] branches/soc-2007-mosani/source: Getting the render api branch to compile with Makefiles.

Chris Want cwant at ualberta.ca
Tue Aug 14 20:06:18 CEST 2007


Revision: 11601
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11601
Author:   hos
Date:     2007-08-14 20:06:18 +0200 (Tue, 14 Aug 2007)

Log Message:
-----------
Getting the render api branch to compile with Makefiles.
A couple of notes:

1) The student should check what line terminators are used,
for example source/blender/render/render_api/source/RND_internal.c
uses both DOS and UNIX line terminators. Blender standard is to
use only UNIX line terminators, and the student should fix this ASAP.

2) I removed a couple of lines with:

#include "intern/openexr/openexr_multi.h"

This include defines functions (BAD!!) and so if it is included
in more than one file, then there are multiple definition of
symbol errors. The effected files are:

source/blender/render/render_api/source/RND_internal.c
source/blender/render/intern/source/rendercallbacks.c

Check to see if there are problems, please.

Modified Paths:
--------------
    branches/soc-2007-mosani/source/Makefile
    branches/soc-2007-mosani/source/blender/blenpluginapi/intern/Makefile
    branches/soc-2007-mosani/source/blender/radiosity/intern/source/Makefile
    branches/soc-2007-mosani/source/blender/render/Makefile
    branches/soc-2007-mosani/source/blender/render/intern/source/Makefile
    branches/soc-2007-mosani/source/blender/render/intern/source/rendercallbacks.c
    branches/soc-2007-mosani/source/blender/render/render_api/source/RND_internal.c
    branches/soc-2007-mosani/source/blender/src/Makefile
    branches/soc-2007-mosani/source/blender/yafray/intern/Makefile

Added Paths:
-----------
    branches/soc-2007-mosani/source/blender/render/render_api/Makefile
    branches/soc-2007-mosani/source/blender/render/render_api/source/Makefile

Modified: branches/soc-2007-mosani/source/Makefile
===================================================================
--- branches/soc-2007-mosani/source/Makefile	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -83,6 +83,8 @@
 GRPLIB += $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a
 GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
 GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
+GRPLIB += $(OCGDIR)/blender/blenpluginapi/$(DEBUG_DIR)libblenpluginapi.a
+GRPLIB += $(OCGDIR)/blender/render_api/$(DEBUG_DIR)librender_api.a
 GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
 GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
 GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
@@ -97,7 +99,6 @@
 COMLIB = $(OCGDIR)/blender/blenkernel/$(DEBUG_DIR)libblenkernel.a
 COMLIB += $(NAN_DECIMATION)/lib/libdecimation.a
 COMLIB += $(OCGDIR)/blender/blenloader/$(DEBUG_DIR)libblenloader.a
-COMLIB += $(OCGDIR)/blender/blenpluginapi/$(DEBUG_DIR)libblenpluginapi.a
 COMLIB += $(OCGDIR)/blender/nodes_shd/$(DEBUG_DIR)libnodes_shd.a
 COMLIB += $(OCGDIR)/blender/nodes_cmp/$(DEBUG_DIR)libnodes_cmp.a
 COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a

Modified: branches/soc-2007-mosani/source/blender/blenpluginapi/intern/Makefile
===================================================================
--- branches/soc-2007-mosani/source/blender/blenpluginapi/intern/Makefile	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/blender/blenpluginapi/intern/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -62,4 +62,5 @@
 # path to imbuf
 CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I../../render/render_api/include
 

Modified: branches/soc-2007-mosani/source/blender/radiosity/intern/source/Makefile
===================================================================
--- branches/soc-2007-mosani/source/blender/radiosity/intern/source/Makefile	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/blender/radiosity/intern/source/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -58,3 +58,4 @@
 CPPFLAGS += -I../include -I../../../include -I../../extern/include
 CPPFLAGS += -I../../../render/extern/include 
 CPPFLAGS += -I../../../render/intern/include 
+CPPFLAGS += -I../../../render/render_api/include 

Modified: branches/soc-2007-mosani/source/blender/render/Makefile
===================================================================
--- branches/soc-2007-mosani/source/blender/render/Makefile	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/blender/render/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -32,6 +32,6 @@
 # Bounces make to subdirectories.
 
 SOURCEDIR = source/blender/render
-DIRS = intern
+DIRS = intern render_api
 
 include nan_subdirs.mk

Modified: branches/soc-2007-mosani/source/blender/render/intern/source/Makefile
===================================================================
--- branches/soc-2007-mosani/source/blender/render/intern/source/Makefile	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/blender/render/intern/source/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -47,6 +47,7 @@
 # The external modules follow after. There should be a nicer way to say this.
 CPPFLAGS += -I../include 
 CPPFLAGS += -I../../extern/include 
+CPPFLAGS += -I../../render_api/include 
 CPPFLAGS += -I../../../radiosity/extern/include 
 CPPFLAGS += -I../../../blenlib
 CPPFLAGS += -I../../../imbuf

Modified: branches/soc-2007-mosani/source/blender/render/intern/source/rendercallbacks.c
===================================================================
--- branches/soc-2007-mosani/source/blender/render/intern/source/rendercallbacks.c	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/blender/render/intern/source/rendercallbacks.c	2007-08-14 18:06:18 UTC (rev 11601)
@@ -62,7 +62,6 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "intern/openexr/openexr_multi.h"
 
 #include "RE_pipeline.h"
 #include "radio.h"
@@ -115,7 +114,6 @@
 #include "BLI_rand.h"
 #include "BLI_threads.h"
 
-#include "intern/openexr/openexr_multi.h"
 
 /* internal */
 #include "render_types.h"

Added: branches/soc-2007-mosani/source/blender/render/render_api/Makefile
===================================================================
--- branches/soc-2007-mosani/source/blender/render/render_api/Makefile	                        (rev 0)
+++ branches/soc-2007-mosani/source/blender/render/render_api/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -0,0 +1,37 @@
+#
+# $Id: Makefile 14 2002-10-13 15:57:19Z hans $
+#
+# ***** 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/render/render_api
+DIRS = source
+
+include nan_subdirs.mk

Added: branches/soc-2007-mosani/source/blender/render/render_api/source/Makefile
===================================================================
--- branches/soc-2007-mosani/source/blender/render/render_api/source/Makefile	                        (rev 0)
+++ branches/soc-2007-mosani/source/blender/render/render_api/source/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -0,0 +1,76 @@
+#
+# $Id: Makefile 6885 2006-02-21 21:24:06Z hos $
+#
+# ***** 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 = render_api
+DIR = $(OCGDIR)/blender/$(LIBNAME)
+
+include nan_compile.mk
+
+ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
+    CFLAGS += -funsigned-char
+    CCFLAGS += -funsigned-char
+endif
+
+CFLAGS += $(LEVEL_1_C_WARNINGS)
+
+# first /include is my own includes, second is the external interface. 
+# The external modules follow after. There should be a nicer way to say this.
+CPPFLAGS += -I../include 
+CPPFLAGS += -I../../intern/include 
+CPPFLAGS += -I../../extern/include 
+#CPPFLAGS += -I../../../radiosity/extern/include 
+CPPFLAGS += -I../../../blenlib
+CPPFLAGS += -I../../../imbuf
+CPPFLAGS += -I../../../makesdna
+CPPFLAGS += -I../../../blenkernel
+CPPFLAGS += -I../../../blenpluginapi
+
+#CPPFLAGS += -I../../../quicktime
+#CPPFLAGS += -I../../../yafray
+#CPPFLAGS += -I../../../../kernel/gen_messaging
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+# not very neat: the rest of blender..
+#CPPFLAGS += -I../../../include 
+#CPPFLAGS += $(NAN_SDLCFLAGS)
+
+#ifeq ($(WITH_QUICKTIME), true)
+#	CPPFLAGS += -DWITH_QUICKTIME
+#endif
+
+#ifeq ($(WITH_FFMPEG),true)
+#        CPPFLAGS += -DWITH_FFMPEG
+#endif
+
+ifeq ($(WITH_OPENEXR),true)
+	CPPFLAGS += -DWITH_OPENEXR
+endif

Modified: branches/soc-2007-mosani/source/blender/render/render_api/source/RND_internal.c
===================================================================
--- branches/soc-2007-mosani/source/blender/render/render_api/source/RND_internal.c	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/blender/render/render_api/source/RND_internal.c	2007-08-14 18:06:18 UTC (rev 11601)
@@ -34,7 +34,6 @@
 
 /* functions needed for new_render_result */
 #include "renderpipeline.h"
-#include "intern/openexr/openexr_multi.h"
 
 #include "PLU_core_api.h"
 #include "RenderAPI_internal.h"

Modified: branches/soc-2007-mosani/source/blender/src/Makefile
===================================================================
--- branches/soc-2007-mosani/source/blender/src/Makefile	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/blender/src/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -64,6 +64,8 @@
 
 # External interfaces of modules:
 CPPFLAGS += -I../render/extern/include
+CPPFLAGS += -I../render/render_api/include
+CPPFLAGS += -I../blenpluginapi
 CPPFLAGS += -I../blenkernel
 CPPFLAGS += -I../blenlib
 CPPFLAGS += -I../nodes

Modified: branches/soc-2007-mosani/source/blender/yafray/intern/Makefile
===================================================================
--- branches/soc-2007-mosani/source/blender/yafray/intern/Makefile	2007-08-14 16:47:19 UTC (rev 11600)
+++ branches/soc-2007-mosani/source/blender/yafray/intern/Makefile	2007-08-14 18:06:18 UTC (rev 11601)
@@ -45,6 +45,7 @@
 CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../render/extern/include
 CPPFLAGS += -I../../render/intern/include

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list