[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28140] trunk/blender/source: Modifiers moved, adjust accordingly.

gsr b3d gsr.b3d at infernal-iceberg.com
Mon Apr 12 03:23:55 CEST 2010


Revision: 28140
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28140
Author:   gsrb3d
Date:     2010-04-12 03:23:55 +0200 (Mon, 12 Apr 2010)

Log Message:
-----------
Modifiers moved, adjust accordingly.

Modified Paths:
--------------
    trunk/blender/source/Makefile
    trunk/blender/source/blender/blenkernel/intern/Makefile

Added Paths:
-----------
    trunk/blender/source/blender/modifiers/intern/Makefile

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2010-04-12 01:09:59 UTC (rev 28139)
+++ trunk/blender/source/Makefile	2010-04-12 01:23:55 UTC (rev 28140)
@@ -97,6 +97,7 @@
 COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a
 COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a
 COMLIB += $(OCGDIR)/blender/ikplugin/$(DEBUG_DIR)libikplugin.a
+COMLIB += $(OCGDIR)/blender/modifiers/$(DEBUG_DIR)libmodifiers.a
 COMLIB += $(NAN_IKSOLVER)/lib/$(DEBUG_DIR)libiksolver.a
 COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc.a
 COMLIB += $(NAN_ITASC)/lib/$(DEBUG_DIR)libitasc_kdl.a

Modified: trunk/blender/source/blender/blenkernel/intern/Makefile
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/Makefile	2010-04-12 01:09:59 UTC (rev 28139)
+++ trunk/blender/source/blender/blenkernel/intern/Makefile	2010-04-12 01:23:55 UTC (rev 28140)
@@ -85,6 +85,9 @@
 #path to gpu
 CPPFLAGS += -I../../gpu
 
+#modifiers got moved
+CPPFLAGS += -I../../modifiers
+
 # path to our own external headerfiles
 CPPFLAGS += -I..
 

Added: trunk/blender/source/blender/modifiers/intern/Makefile
===================================================================
--- trunk/blender/source/blender/modifiers/intern/Makefile	                        (rev 0)
+++ trunk/blender/source/blender/modifiers/intern/Makefile	2010-04-12 01:23:55 UTC (rev 28140)
@@ -0,0 +1,55 @@
+#
+# $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 = modifiers
+DIR = $(OCGDIR)/blender/$(LIBNAME)
+
+include nan_compile.mk
+
+CFLAGS += $(LEVEL_1_C_WARNINGS)
+
+CPPFLAGS += -I..
+
+CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../makesrna
+CPPFLAGS += -I../../blenlib
+CPPFLAGS += -I../../blenkernel
+CPPFLAGS += -I../../blenkernel/intern
+CPPFLAGS += -I../../render/extern/include
+
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+
+CPPFLAGS += -I$(NAN_DECIMATION)/include
+CPPFLAGS += -I$(NAN_ELBEEM)/include
+CPPFLAGS += -I$(NAN_OPENNL)/include
+CPPFLAGS += -I$(NAN_BSP)/include
+# CPPFLAGS += -I$(NAN_SMOKE)/include
+
+


Property changes on: trunk/blender/source/blender/modifiers/intern/Makefile
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native





More information about the Bf-blender-cvs mailing list