From f747fa3a7f22104a26c49c8ad65f71638b89188d Mon Sep 17 00:00:00 2001 From: Stephen Swaney Date: Tue, 27 Jun 2006 15:54:37 +0000 Subject: [PATCH] =?UTF-8?q?patch=20from=20Ralf=20H=C3=B6lzemer=20(cheleb)?= =?UTF-8?q?=20for=20#4499=20Fix=20for=20build=20of=20blenderplayer=20on=20?= =?UTF-8?q?windows/mingw/scons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes some invalid cflags for gcc on windows/mingw/scons -if sys.platform=='win32': +if (sys.platform=='win32') & ( Environment().subst('$CC') != 'gcc'): cflags = ['/GR'] Patch looks ok but no mingw evironment here to test. So mingw/sconsers to your testing stations. We can always roll back! --- source/gameengine/GamePlayer/common/SConscript | 2 +- source/gameengine/GamePlayer/ghost/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript index 548d8e75288..d12d3131ae5 100644 --- a/source/gameengine/GamePlayer/common/SConscript +++ b/source/gameengine/GamePlayer/common/SConscript @@ -66,7 +66,7 @@ incs += Split(env['BF_PNG_INC']) incs += Split(env['BF_ZLIB_INC']) cflags=[] -if sys.platform=='win32': +if (sys.platform=='win32') & ( Environment().subst('$CC') != 'gcc'): cflags = ['/GR'] env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, compileflags=cflags) diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index dd7beced816..3e663bc09d6 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -43,7 +43,7 @@ incs = ['.', incs += Split(env['BF_PYTHON_INC']) incs += Split(env['BF_SOLID_INC']) cflags = [] -if sys.platform=='win32': +if (sys.platform=='win32') & ( Environment().subst('$CC') != 'gcc'): cflags = ['/GR'] env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags)