[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13044] branches/blender2.5/blender/source : Now Makefiles should be uptodate.
Ton Roosendaal
ton at blender.org
Sat Dec 29 15:56:16 CET 2007
Revision: 13044
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13044
Author: ton
Date: 2007-12-29 15:56:16 +0100 (Sat, 29 Dec 2007)
Log Message:
-----------
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...
Modified Paths:
--------------
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
branches/blender2.5/blender/source/blender/nodes/Makefile
branches/blender2.5/blender/source/blender/nodes/intern/Makefile
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/Makefile
branches/blender2.5/blender/source/blender/editors/area/Makefile
Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile 2007-12-29 14:31:26 UTC (rev 13043)
+++ branches/blender2.5/blender/source/Makefile 2007-12-29 14:56:16 UTC (rev 13044)
@@ -77,7 +77,7 @@
# Note: the order is important here
GRPLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a
-#GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a
+GRPLIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
GRPLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a
GRPLIB += $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a
@@ -226,7 +226,8 @@
PULIB += $(NAN_MOTO)/lib/libmoto.a
PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a
PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
-#PULIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a
+PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
+PULIB += $(OCGDIR)/blender/editors_datafiles/libeditors_datafiles.a
ifeq ($(NAN_NO_KETSJI),true)
PULIB += $(NAN_MOTO)/lib/libmoto.a
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c 2007-12-29 14:31:26 UTC (rev 13043)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c 2007-12-29 14:56:16 UTC (rev 13044)
@@ -317,7 +317,7 @@
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 @@
init_actuator(act);
strcpy(act->name, "act");
- make_unique_prop_names(act->name);
+// XXX make_unique_prop_names(act->name);
return act;
}
Added: branches/blender2.5/blender/source/blender/editors/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/Makefile (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/Makefile 2007-12-29 14:56:16 UTC (rev 13044)
@@ -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
Added: branches/blender2.5/blender/source/blender/editors/area/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/area/Makefile (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/area/Makefile 2007-12-29 14:56:16 UTC (rev 13044)
@@ -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
Modified: branches/blender2.5/blender/source/blender/nodes/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/Makefile 2007-12-29 14:31:26 UTC (rev 13043)
+++ branches/blender2.5/blender/source/blender/nodes/Makefile 2007-12-29 14:56:16 UTC (rev 13044)
@@ -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 *****
#
-#
+# Bounces make to subdirectories.
-LIBNAME = nodes
-DIR = $(OCGDIR)/blender/$(LIBNAME)
+SOURCEDIR = source/blender/nodes
+DIRS = intern
-include nan_compile.mk
-
-CFLAGS += $(LEVEL_1_C_WARNINGS)
-
-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
Modified: branches/blender2.5/blender/source/blender/nodes/intern/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/intern/Makefile 2007-12-29 14:31:26 UTC (rev 13043)
+++ branches/blender2.5/blender/source/blender/nodes/intern/Makefile 2007-12-29 14:56:16 UTC (rev 13044)
@@ -42,7 +42,10 @@
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
More information about the Bf-blender-cvs
mailing list