diff options
| author | Stephen Swaney <sswaney@centurytel.net> | 2006-06-27 19:54:37 +0400 |
|---|---|---|
| committer | Stephen Swaney <sswaney@centurytel.net> | 2006-06-27 19:54:37 +0400 |
| commit | f747fa3a7f22104a26c49c8ad65f71638b89188d (patch) | |
| tree | 2c5e5826ca18abd5a4e1dd33c88f71c4a3091ee0 /source/gameengine/GamePlayer | |
| parent | 31416d8d7e7fca90b30a579ddcc036fade804f9d (diff) | |
patch from Ralf Hölzemer (cheleb) for
#4499 Fix for build of blenderplayer on windows/mingw/scons
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!
Diffstat (limited to 'source/gameengine/GamePlayer')
| -rw-r--r-- | source/gameengine/GamePlayer/common/SConscript | 2 | ||||
| -rw-r--r-- | 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) |