Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2006-02-08 00:24:36 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2006-02-08 00:24:36 +0300
commitef1b7a5735fea454f88f9d18cf9034279f8fb0b6 (patch)
tree8606ed6ca4eeee76c1cd1840c06fcaf09519f311 /source/blender/imbuf
parentb11c92c66e437166197fed77be698392f941b3a5 (diff)
==SCons==
+ 'scons blenderplayer' builds blender AND blenderplayer now (tested on Linux only, but was only linking issue, so should work on other platforms too). NOTE: I noticed some compileflags for GE specific libs that were left out - I re-enabled them in the SConscripts, but I'm going to do a test build my- self now, so if there are problems with them on win32, I probably already know about them :)
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/SConscript2
-rw-r--r--source/blender/imbuf/intern/openexr/SConscript3
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 7d0afa3f0e5..93041ab97cf 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -23,4 +23,4 @@ if env['WITH_BF_QUICKTIME']==1:
incs += ' ' + env['BF_QUICKTIME_INC']
defs.append('WITH_QUICKTIME')
-env.BlenderLib ( libname = 'blender_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype='core', priority = 80 )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index ec7b9b3518d..a710e26ad5d 100644
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -13,5 +13,4 @@ incs += Split(env['BF_OPENEXR_INC'])
defs = []
-#openexr_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_openexr', source=source_files)
-env.BlenderLib ('blender_openexr', source_files, incs, defs, libtype='core', priority = 90)
+env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])