From 70a4ead0ae6f8ffabb1178ec2ed4d1fafa3e232e Mon Sep 17 00:00:00 2001 From: Michel Selten Date: Sun, 29 Feb 2004 21:40:48 +0000 Subject: SCons updates * Blender static now links. By default this option is disabled on all platforms. Simply set the option in config.opts to 'true'. * Added the following flags to config.opts: - HOST_CC. This is the C compiler for the host platform. This value is the same as TARGET_CC when not cross compiling. - HOST_CXX. This is the C++ compiler for the host platform. This value is the same as TARGET_CXX when not cross compiling. - TARGET_CC. This is the C compiler for the target platform. - TARGET_CXX. This is the C++ compiler for the target platform. - TARGET_AR. This is the linker command for linking libraries. - PATH This is the standard search path All SConscript files have been updated to reflect these changes. Now it's possible to change only the root SConstruct file, and all compiler specific variables are passed automatically to all SConscript files. Of course, this does not apply to makesdna because there the host and target platform is different from all other libraries. To pass a variable that applies to all platforms, all we now have to do is set the correct value in library_env Note: as usual, to get the latest options in the config.opts file, first remove your version. --- intern/iksolver/SConscript | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'intern/iksolver/SConscript') diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript index 0121024110e..7a8b60b3c0e 100644 --- a/intern/iksolver/SConscript +++ b/intern/iksolver/SConscript @@ -1,13 +1,7 @@ -iksolver_env = Environment() - -# Import the C flags set in the SConstruct file -Import ('cflags') -Import ('cxxflags') -Import ('defines') Import ('user_options_dict') -iksolver_env.Append (CCFLAGS = cflags) -iksolver_env.Append (CXXFLAGS = cxxflags) -iksolver_env.Append (CPPDEFINES = defines) +Import ('library_env') + +iksolver_env = library_env.Copy () source_files = ['intern/IK_QChain.cpp', 'intern/IK_QJacobianSolver.cpp', -- cgit v1.2.3