diff options
author | Ton Roosendaal <ton@blender.org> | 2007-12-29 17:56:16 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-12-29 17:56:16 +0300 |
commit | 878e09396e74f14c73bd1e97b01d5406b17ed858 (patch) | |
tree | 83cb9f0fc6f9c56bd4ee91a3635a05a1388c090f /source/blender | |
parent | 6407b5f70374c682b6f8e9b28fcf6c49fdab46ca (diff) |
Now Makefiles should be uptodate.
Also fixed old error in make for nodes, it didn't enter subdirs
correctly?
Left: 63 unresolved symbols on linking...
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/sca.c | 4 | ||||
-rw-r--r-- | source/blender/editors/Makefile | 34 | ||||
-rw-r--r-- | source/blender/editors/area/Makefile | 49 | ||||
-rw-r--r-- | source/blender/nodes/Makefile | 31 | ||||
-rw-r--r-- | source/blender/nodes/intern/Makefile | 5 |
5 files changed, 98 insertions, 25 deletions
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index 7dab2e51993..6f372bfb45d 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -317,7 +317,7 @@ bController *new_controller(int type) init_controller(cont); strcpy(cont->name, "cont"); - make_unique_prop_names(cont->name); +// XXX make_unique_prop_names(cont->name); return cont; } @@ -479,7 +479,7 @@ bActuator *new_actuator(int type) init_actuator(act); strcpy(act->name, "act"); - make_unique_prop_names(act->name); +// XXX make_unique_prop_names(act->name); return act; } diff --git a/source/blender/editors/Makefile b/source/blender/editors/Makefile new file mode 100644 index 00000000000..d5002f530c1 --- /dev/null +++ b/source/blender/editors/Makefile @@ -0,0 +1,34 @@ +# +# $Id: Makefile +# +# ***** 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) Blender Foundation. +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL LICENSE BLOCK ***** +# +# Bounces make to subdirectories. + +SOURCEDIR = source/blender/editors +DIRS = area datafiles screen + +include nan_subdirs.mk diff --git a/source/blender/editors/area/Makefile b/source/blender/editors/area/Makefile new file mode 100644 index 00000000000..302267be505 --- /dev/null +++ b/source/blender/editors/area/Makefile @@ -0,0 +1,49 @@ +# +# $Id: Makefile 14 2002-10-13 15:57:19Z hans $ +# +# ***** 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) 2007 Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# ***** END GPL LICENSE BLOCK ***** +# +# Makes module object directory and bounces make to subdirectories. + +LIBNAME = editors_datafiles +DIR = $(OCGDIR)/blender/$(LIBNAME) + +include nan_compile.mk + +CFLAGS += $(LEVEL_1_C_WARNINGS) + +CPPFLAGS += -I$(OPENGL_HEADERS) + +# not very neat.... +CPPFLAGS += -I../../../blenkernel +CPPFLAGS += -I../../../blenlib +CPPFLAGS += -I../../../makesdna +CPPFLAGS += -I../../../imbuf +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include + +# own include + +CPPFLAGS += -I../include diff --git a/source/blender/nodes/Makefile b/source/blender/nodes/Makefile index 9151d449a59..65a0e591848 100644 --- a/source/blender/nodes/Makefile +++ b/source/blender/nodes/Makefile @@ -1,15 +1,12 @@ # -# $Id$ +# $Id: Makefile # -# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# ***** 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. 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. +# 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 @@ -20,28 +17,18 @@ # 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. +# The Original Code is Copyright (C) Blender Foundation. # All rights reserved. # # The Original Code is: all of this file. # # Contributor(s): none yet. # -# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# ***** END GPL LICENSE BLOCK ***** # -# - -LIBNAME = nodes -DIR = $(OCGDIR)/blender/$(LIBNAME) - -include nan_compile.mk +# Bounces make to subdirectories. -CFLAGS += $(LEVEL_1_C_WARNINGS) +SOURCEDIR = source/blender/nodes +DIRS = intern -CPPFLAGS += -I../../blenkernel -CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include -CPPFLAGS += -I../../makesdna -CPPFLAGS += -I../../blenlib -CPPFLAGS += -I../../editors/include -CPPFLAGS += -I../../imbuf -CPPFLAGS += -I../../render/extern/include +include nan_subdirs.mk diff --git a/source/blender/nodes/intern/Makefile b/source/blender/nodes/intern/Makefile index 3b7783c5d1e..f5908411f88 100644 --- a/source/blender/nodes/intern/Makefile +++ b/source/blender/nodes/intern/Makefile @@ -42,7 +42,10 @@ CPPFLAGS += -I../../blenkernel CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../blenlib -CPPFLAGS += -I../../include +CPPFLAGS += -I../../editors/include CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../render/extern/include CPPFLAGS += -I$(OPENGL_HEADERS) + +DIRS = SHD_nodes CMP_nodes +include nan_subdirs.mk |