diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-11 17:43:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-11 17:43:25 +0200 |
| commit | 26dfcdba6c306d6312c598e4191449302329be68 (patch) | |
| tree | 2bf56b5a0eb2cc554833fdc6e08f2b59f1bfdabd /mesalib/SConstruct | |
| parent | 2dc2880eacae3d52f4ab4bb5ec43c5bbf50c5c3f (diff) | |
| parent | ae06feae7876db47ff0e1fde40cf4a324a412037 (diff) | |
| download | vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.tar.gz vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.tar.bz2 vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/imports.h
Diffstat (limited to 'mesalib/SConstruct')
| -rw-r--r-- | mesalib/SConstruct | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mesalib/SConstruct b/mesalib/SConstruct index 0e10818ba..ef71ab69c 100644 --- a/mesalib/SConstruct +++ b/mesalib/SConstruct @@ -80,9 +80,6 @@ env.Append(CPPPATH = [ '#/src/gallium/winsys', ]) -if env['msvc']: - env.Append(CPPPATH = ['#include/c99']) - # for debugging #print env.Dump() @@ -115,9 +112,6 @@ if env['crosscompile'] and not env['embedded']: host_env['hostonly'] = True assert host_env['crosscompile'] == False - if host_env['msvc']: - host_env.Append(CPPPATH = ['#include/c99']) - target_env = env env = host_env Export('env') |