From 8023fb42828fe6d1b69413d5a31aec3a9f3e4201 Mon Sep 17 00:00:00 2001
From: Michel Selten <michel@mselten.demon.nl>
Date: Tue, 24 Feb 2004 20:03:27 +0000
Subject: SCons updates * Added the options to build (configurable via
 config.opts):   - blender dynamic (default enabled),   - blender static
 (default disabled). Not working because of a linking order     problem. The
 /usr/lib/libGL.a and /usr/lib/libGLU.a flags need to be     appended at the
 end of the link command, not directly after the linker.     Mailed the SCons
 mail list for a possible solution.   - blender player (default disabled). Not
 implemented yet anyway.   - blender plugin (default disabled). Not
 implemented yet anyway. * Added the following variables to the config.opts:  
 - OPENGL_STATIC. This flag is only needed when building blender static.   -
 USE_BUILDINFO (true/false). Display build information in the splash    
 screen. When enabled, it will always rebuild source/creator/buildinfo.c,    
 so for compilation speed reasons, it is not adviced to enable this all the   
  time.

I had to make some adjustments specifically for the windows build
(winblender.res) file. This file is only compiled when building the dynamic
blender. I hope this is correct.
---
 source/SConscript             |  3 ++-
 source/blender/src/SConscript |  3 +++
 source/creator/SConscript     | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 source/creator/SConscript

(limited to 'source')

diff --git a/source/SConscript b/source/SConscript
index e0005569caf..1d614db7514 100644
--- a/source/SConscript
+++ b/source/SConscript
@@ -1,6 +1,7 @@
 Import ('user_options_dict')
 
 SConscript(['blender/SConscript',
-            'kernel/SConscript'])
+            'kernel/SConscript',
+            'creator/SConscript'])
 if user_options_dict['BUILD_GAMEENGINE'] == 1:
     SConscript (['gameengine/SConscript'])
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index 91c75559f2c..4e434655059 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -143,6 +143,9 @@ if user_options_dict['USE_INTERNATIONAL'] == 1:
     src_env.Append (CPPDEFINES = 'INTERNATIONAL')
     src_env.Append (CPPDEFINES = 'FTGL_STATIC_LIBRARY')
 
+if user_options_dict['USE_BUILDINFO'] == 1:
+    src_env.Append (CPPDEFINES = 'NAN_BUILDINFO')
+
 src_env.Append (CPPPATH=extra_includes)
 
 src_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blendersrc', source=source_files)
diff --git a/source/creator/SConscript b/source/creator/SConscript
new file mode 100644
index 00000000000..6210f578af2
--- /dev/null
+++ b/source/creator/SConscript
@@ -0,0 +1,29 @@
+creator_env = Environment ()
+
+Import ('cflags')
+Import ('cxxflags')
+Import ('defines')
+Import ('user_options_dict')
+creator_env.Append (CCFLAGS = cflags)
+creator_env.Append (CXXFLAGS = cxxflags)
+creator_env.Append (CPPDEFINES = defines)
+
+source_files = ['creator.c']
+
+creator_env.Append (CPPPATH = ['#/intern/guardedalloc',
+                               '../blender/blenlib',
+                               '../blender/blenkernel',
+                               '../blender/include',
+                               '../blender/blenloader',
+                               '../blender/imbuf',
+                               '../blender/renderconverter',
+                               '../blender/render/extern/include',
+                               '../blender/python',
+                               '../blender/makesdna',
+                               '../kernel/gen_messaging',
+                               '../kernel/gen_system'])
+
+if user_options_dict['USE_QUICKTIME'] == 1:
+    creator_env.Append (CPPDEFINES = ['WITH_QUICKTIME'])
+
+creator_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_creator', source=source_files)
-- 
cgit v1.2.3