diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-07-19 13:19:54 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-07-19 13:19:54 +0400 |
| commit | 1f8f55b3cd268eb2124ace50b455586a329c2b89 (patch) | |
| tree | 82ad668dae349fa5917c6bfb9f896722edef410e /source/blender/blenlib/SConscript | |
| parent | 38860522bfc61d3245110822e2003cc9cda61328 (diff) | |
- Reverted "Set FREE_WINDOWS when compiling with MinGW"
- Reverted own changes made to _stat function BLI_exists
- Use __MINGW32__ instead of FREE_WINDOWS in BLI_exists
- Removed recently added lib dependencies for mingw
Diffstat (limited to 'source/blender/blenlib/SConscript')
| -rw-r--r-- | source/blender/blenlib/SConscript | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 37dc8bbe012..78aecf9936b 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -7,7 +7,7 @@ cflags='' incs = '. ../makesdna ../blenkernel #/intern/guardedalloc #/intern/ghost ../editors/include ../gpu' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] -defs = [] +defs = '' if env['OURPLATFORM'] == 'linux2': cflags='-pthread' @@ -16,9 +16,6 @@ if env['OURPLATFORM'] == 'linux2': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -if env['OURPLATFORM'] == 'win32-mingw': - defs.append('FREE_WINDOWS') - if env['OURPLATFORM'] == 'linuxcross': if env['WITH_BF_OPENMP']: incs += ' ' + env['BF_OPENMP_INC'] @@ -27,4 +24,4 @@ if env['OURPLATFORM'] == 'darwin': if env['WITH_BF_OPENMP']: env.Append(CFLAGS=['-DPARALLEL=1']) -env.BlenderLib ( 'bf_blenlib', sources, Split(incs), defs, libtype=['core','player'], priority = [363,170], compileflags =cflags ) +env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [363,170], compileflags =cflags ) |