[Bf-blender-cvs] [d9ce183] temp_merge_gooseberry_hair: Fixed scons build files for new physics subfolder.
Lukas Tönne
noreply at git.blender.org
Mon Jan 19 20:49:24 CET 2015
Commit: d9ce183c2a57c76df0f9420cde33536a5ed360f9
Author: Lukas Tönne
Date: Thu Sep 18 10:35:26 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rBd9ce183c2a57c76df0f9420cde33536a5ed360f9
Fixed scons build files for new physics subfolder.
===================================================================
M source/blender/blenkernel/SConscript
A source/blender/physics/SConscript
===================================================================
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 0484200..6c2a6f3 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -65,6 +65,7 @@ incs = [
'../makesrna',
'../modifiers',
'../nodes',
+ '../physics',
'../render/extern/include',
'../windowmanager',
env['BF_ZLIB_INC'],
diff --git a/source/blender/physics/SConscript b/source/blender/physics/SConscript
new file mode 100644
index 0000000..7945b52
--- /dev/null
+++ b/source/blender/physics/SConscript
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+#
+# ***** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2011, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jeroen Bakker, Monique Dewanchand, Blender Developers Fund.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+Import ('env')
+defs = []
+
+sources = env.Glob('intern/*.cpp') + env.Glob('intern/*.c')
+
+incs = [
+ '.',
+ 'intern',
+ '../blenlib',
+ '../blenkernel',
+ '../imbuf',
+ '../makesdna',
+ '../../../intern/guardedalloc',
+ '../../../extern/Eigen3',
+ ]
+
+env.BlenderLib('bf_physics', sources, incs, defines=defs, libtype=['core'], priority=[164])
More information about the Bf-blender-cvs
mailing list