Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / blenloader / SConscript
index fdaa06a..19a89b7 100644 (file)
@@ -1,30 +1,14 @@
-blenloader_env = Environment()
+#!/usr/bin/python
+Import ('env')
 
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
-Import ('user_options_dict')
-blenloader_env.Append (CCFLAGS = cflags)
-blenloader_env.Append (CXXFLAGS = cxxflags)
-blenloader_env.Append (CPPDEFINES = defines)
+sources = env.Glob('intern/*.c')
 
-source_files = ['intern/genfile.c',
-                'intern/readblenentry.c',
-                'intern/readfile.c',
-                'intern/writefile.c']
+incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
+incs += ' ../makesdna ../readblenfile ../editors/include'
+incs += ' ../render/extern/include ../makesrna'
 
-blenloader_env.Append (CPPPATH = ['.',
-                                  '#/intern/guardedalloc',
-                                  '../blenlib',
-                                  '../blenkernel',
-                                  '../makesdna',
-                                  '../readblenfile',
-                                  '../include',
-                                  '../python',
-                                  '../../kernel/gen_messaging',
-                                  '../render/extern/include',
-                                  '../writestreamglue',
-                                  '../readstreamglue'])
+incs += ' ' + env['BF_ZLIB_INC']
 
-blenloader_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenloader', source=source_files)
+defs = []
+
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [135, 30] )