Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 188889 | Differences between
and this patch

Collapse All | Expand All

(-)SConstruct.orig (-9 / +7 lines)
Lines 21-27 Link Here
21
21
22
VERSION = "0.2.4"
22
VERSION = "0.2.4"
23
23
24
import os, glob, sys, time, platform
24
import os, glob, sys, time, platform, SCons.Util
25
25
26
posix = os.name == 'posix'
26
posix = os.name == 'posix'
27
win32 = os.name == 'nt'
27
win32 = os.name == 'nt'
Lines 97-102 Link Here
97
97
98
env.SConsignFile()
98
env.SConsignFile()
99
99
100
if os.environ.has_key('CFLAGS'):
101
    env['CCFLAGS'] = SCons.Util.CLVar(os.environ['CFLAGS'])
102
if os.environ.has_key('LDFLAGS'):
103
    env['LINKFLAGS'] = SCons.Util.CLVar(os.environ['LDFLAGS'])
104
100
######################################
105
######################################
101
#
106
#
102
# build settings
107
# build settings
Lines 158-164 Link Here
158
	#env['CXXFLAGS'] += ['--no-rtti']
163
	#env['CXXFLAGS'] += ['--no-rtti']
159
	if env['DEBUG'] == False:
164
	if env['DEBUG'] == False:
160
		env.Append(CCFLAGS=[
165
		env.Append(CCFLAGS=[
161
			'-O3',
162
			'-fomit-frame-pointer',
166
			'-fomit-frame-pointer',
163
			'-funroll-loops',
167
			'-funroll-loops',
164
			'-DNDEBUG',
168
			'-DNDEBUG',
Lines 195-201 Link Here
195
		'-W3',
199
		'-W3',
196
	])
200
	])
197
	if env['DEBUG'] == False:
201
	if env['DEBUG'] == False:
198
		env.Append(CCFLAGS=['-MT', '-O2' ])
202
		env.Append(CCFLAGS=['-MT' ])
199
	else:
203
	else:
200
		env.Append(CCFLAGS=['-MTd', '-Zi' ])
204
		env.Append(CCFLAGS=['-MTd', '-Zi' ])
201
205
Lines 404-415 Link Here
404
			print "Libraries and headers for either ALSA, OSS, JACK or CoreAudio are required for building."
408
			print "Libraries and headers for either ALSA, OSS, JACK or CoreAudio are required for building."
405
			Exit(1)
409
			Exit(1)
406
	
410
	
407
	if conf.CheckCPUFlag('sse'):
408
		env['SSE'] = True
409
	if conf.CheckCPUFlag('sse2'):
410
		env['SSE'] = False
411
		env['SSE2'] = True
412
	
413
	if env['LUNAR'] == True: # user wants to build lunar
411
	if env['LUNAR'] == True: # user wants to build lunar
414
		# needs LLVM for that
412
		# needs LLVM for that
415
		wantversion = '1.9'
413
		wantversion = '1.9'

Return to bug 188889