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>2010-07-19 13:04:22 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-07-19 13:04:22 +0400
commit38860522bfc61d3245110822e2003cc9cda61328 (patch)
treec8a44ea1bb4c00dec11fd059b8a7f8f4221df1f2 /source/blender/blenlib/SConscript
parent266438b5e0224de4653ba2a795a069781e926007 (diff)
Set FREE_WINDOWS when compiling with MinGW
Diffstat (limited to 'source/blender/blenlib/SConscript')
-rw-r--r--source/blender/blenlib/SConscript7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 78aecf9936b..37dc8bbe012 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,6 +16,9 @@ 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']
@@ -24,4 +27,4 @@ if env['OURPLATFORM'] == 'darwin':
if env['WITH_BF_OPENMP']:
env.Append(CFLAGS=['-DPARALLEL=1'])
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [363,170], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), defs, libtype=['core','player'], priority = [363,170], compileflags =cflags )