Commit d6be0b55 authored by Brian Paul's avatar Brian Paul

scons/svga: remove opt from the list of valid build types

This reverts commit a5fd54f8.

The whole point was to add a way to pass -DVMX86_STATS to the build,
but we can do that with a command line argument when we invoke scons.
Reviewed-by: Jose Fonseca's avatarJosé Fonseca <jfonseca@vmware.com>
parent 5bcf4795
...@@ -86,7 +86,7 @@ def AddOptions(opts): ...@@ -86,7 +86,7 @@ def AddOptions(opts):
from SCons.Options.EnumOption import EnumOption from SCons.Options.EnumOption import EnumOption
opts.Add(EnumOption('build', 'build type', 'debug', opts.Add(EnumOption('build', 'build type', 'debug',
allowed_values=('debug', 'checked', 'profile', allowed_values=('debug', 'checked', 'profile',
'release', 'opt'))) 'release')))
opts.Add(BoolOption('verbose', 'verbose output', 'no')) opts.Add(BoolOption('verbose', 'verbose output', 'no'))
opts.Add(EnumOption('machine', 'use machine-specific assembly code', opts.Add(EnumOption('machine', 'use machine-specific assembly code',
default_machine, default_machine,
......
...@@ -279,7 +279,7 @@ def generate(env): ...@@ -279,7 +279,7 @@ def generate(env):
if env['build'] == 'profile': if env['build'] == 'profile':
env['debug'] = False env['debug'] = False
env['profile'] = True env['profile'] = True
if env['build'] in ('release', 'opt'): if env['build'] == 'release':
env['debug'] = False env['debug'] = False
env['profile'] = False env['profile'] = False
...@@ -325,8 +325,6 @@ def generate(env): ...@@ -325,8 +325,6 @@ def generate(env):
cppdefines += ['NDEBUG'] cppdefines += ['NDEBUG']
if env['build'] == 'profile': if env['build'] == 'profile':
cppdefines += ['PROFILE'] cppdefines += ['PROFILE']
if env['build'] in ('opt', 'profile'):
cppdefines += ['VMX86_STATS']
if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'): if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'):
cppdefines += [ cppdefines += [
'_POSIX_SOURCE', '_POSIX_SOURCE',
...@@ -477,7 +475,7 @@ def generate(env): ...@@ -477,7 +475,7 @@ def generate(env):
ccflags += [ ccflags += [
'/O2', # optimize for speed '/O2', # optimize for speed
] ]
if env['build'] in ('release', 'opt'): if env['build'] == 'release':
if not env['clang']: if not env['clang']:
ccflags += [ ccflags += [
'/GL', # enable whole program optimization '/GL', # enable whole program optimization
...@@ -588,7 +586,7 @@ def generate(env): ...@@ -588,7 +586,7 @@ def generate(env):
shlinkflags += ['-Wl,--enable-stdcall-fixup'] shlinkflags += ['-Wl,--enable-stdcall-fixup']
#shlinkflags += ['-Wl,--kill-at'] #shlinkflags += ['-Wl,--kill-at']
if msvc: if msvc:
if env['build'] in ('release', 'opt') and not env['clang']: if env['build'] == 'release' and not env['clang']:
# enable Link-time Code Generation # enable Link-time Code Generation
linkflags += ['/LTCG'] linkflags += ['/LTCG']
env.Append(ARFLAGS = ['/LTCG']) env.Append(ARFLAGS = ['/LTCG'])
......
...@@ -92,8 +92,6 @@ svga_get_name( struct pipe_screen *pscreen ) ...@@ -92,8 +92,6 @@ svga_get_name( struct pipe_screen *pscreen )
*/ */
build = "build: DEBUG;"; build = "build: DEBUG;";
mutex = "mutex: " PIPE_ATOMIC ";"; mutex = "mutex: " PIPE_ATOMIC ";";
#elif defined(VMX86_STATS)
build = "build: OPT;";
#else #else
build = "build: RELEASE;"; build = "build: RELEASE;";
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment