[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30491] trunk/blender/source/blender/ blenlib/SConscript: Set FREE_WINDOWS when compiling with MinGW
Nathan Letwory
nathan at letworyinteractive.com
Mon Jul 19 11:04:22 CEST 2010
Revision: 30491
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30491
Author: jesterking
Date: 2010-07-19 11:04:22 +0200 (Mon, 19 Jul 2010)
Log Message:
-----------
Set FREE_WINDOWS when compiling with MinGW
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/SConscript
Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript 2010-07-19 09:02:27 UTC (rev 30490)
+++ trunk/blender/source/blender/blenlib/SConscript 2010-07-19 09:04:22 UTC (rev 30491)
@@ -7,7 +7,7 @@
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'] 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['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 )
More information about the Bf-blender-cvs
mailing list