diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-03-18 02:30:29 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-03-18 02:30:29 +0300 |
| commit | bbbbea6024812f623f5faf7c15fb210d22c39b31 (patch) | |
| tree | c8a7b62730bb7c1b24d46f5b5609c31b4a69448c /source/blender/blenlib/SConscript | |
| parent | baaf0d1b68541bace73aeac0747df3076138bcc5 (diff) | |
scons fix
Diffstat (limited to 'source/blender/blenlib/SConscript')
| -rw-r--r-- | source/blender/blenlib/SConscript | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index b84c6866192..c8172439167 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -9,11 +9,7 @@ incs += ' ../windowmanager ../bmesh #/extern/glew/include' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] -<<<<<<< .working -defs = 'GLEW_STATIC' -======= defs = [] ->>>>>>> .merge-right.r35190 if env['WITH_BF_BINRELOC']: cflags='-pthread' |