Revision: 23666 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23666 Author: gsrb3d Date: 2009-10-06 19:01:00 +0200 (Tue, 06 Oct 2009)
Log Message: ----------- Add raytrace subdir to Makefiles. The makefile is a copy of the source one, not tuned, just to unbreak build. This raises some questions: why separate dirs? why each build system takes a different approach (different libs vs all source files into one)? Modified Paths: -------------- trunk/blender/source/Makefile Added Paths: ----------- trunk/blender/source/blender/render/intern/raytrace/Makefile Modified: trunk/blender/source/Makefile =================================================================== --- trunk/blender/source/Makefile 2009-10-06 16:56:22 UTC (rev 23665) +++ trunk/blender/source/Makefile 2009-10-06 17:01:00 UTC (rev 23666) @@ -83,6 +83,7 @@ GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a +GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender_raytrace.a # nlin: the reason that some libraries appear more than once below is # to handle circular dependencies in linking among libraries... some Added: trunk/blender/source/blender/render/intern/raytrace/Makefile =================================================================== --- trunk/blender/source/blender/render/intern/raytrace/Makefile (rev 0) +++ trunk/blender/source/blender/render/intern/raytrace/Makefile 2009-10-06 17:01:00 UTC (rev 23666) @@ -0,0 +1,65 @@ +# +# $Id$ +# +# ***** BEGIN GPL 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. +# +# 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 LICENSE BLOCK ***** +# +# + +LIBNAME = render_raytrace +DIR = $(OCGDIR)/blender/render + +include nan_compile.mk + +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../../extern/include +CPPFLAGS += -I../../../blenlib +CPPFLAGS += -I../../../imbuf +CPPFLAGS += -I../../../makesdna +CPPFLAGS += -I../../../makesrna +CPPFLAGS += -I../../../blenkernel +CPPFLAGS += -I../../../quicktime +CPPFLAGS += -I../../../../kernel/gen_messaging +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +# not very neat: the rest of blender.. +CPPFLAGS += -I../../../editors/include +CPPFLAGS += $(NAN_SDLCFLAGS) +CPPFLAGS += -I../../../../../intern/smoke/extern + +ifeq ($(WITH_QUICKTIME), true) + CPPFLAGS += -DWITH_QUICKTIME +endif + +ifeq ($(WITH_FFMPEG),true) + CPPFLAGS += -DWITH_FFMPEG +endif + +ifeq ($(WITH_OPENEXR),true) + CPPFLAGS += -DWITH_OPENEXR +endif Property changes on: trunk/blender/source/blender/render/intern/raytrace/Makefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs