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

Collapse All | Expand All

(-)src/SConscript.env.orig (-44 / +7 lines)
Lines 873-908 Link Here
873
#Tell SCons to build libraries that are bundled with Mixxx
873
#Tell SCons to build libraries that are bundled with Mixxx
874
#===================================================
874
#===================================================
875
875
876
#SoundTouch
876
#SoundTouch
877
#XXX this should be done with a subsconscript
877
sources += Split("""engine/enginebufferscalest.cpp""")
878
878
env.Append(CPPPATH = [ ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch' ])
879
soundtouch_path = 'soundtouch-1.4.1'
879
env.Append(LIBS = 'SoundTouch')
880
880
881
env.Append(CPPPATH=['#lib/'+soundtouch_path])
881
#KissFFT
882
sources += Split("""engine/enginebufferscalest.cpp
883
                    #lib/""" + soundtouch_path + """/SoundTouch.cpp
884
                    #lib/""" + soundtouch_path + """/TDStretch.cpp
885
                    #lib/""" + soundtouch_path + """/RateTransposer.cpp
886
                    #lib/""" + soundtouch_path + """/AAFilter.cpp
887
                    #lib/""" + soundtouch_path + """/FIFOSampleBuffer.cpp
888
                    #lib/""" + soundtouch_path + """/FIRFilter.cpp
889
                    #lib/""" + soundtouch_path + """/PeakFinder.cpp
890
                    #lib/""" + soundtouch_path + """/BPMDetect.cpp
891
                    """)
892
893
if 'win' in platformString:
894
	if bitwidth == '64':
895
		sources += Split("""#lib/""" + soundtouch_path + """/cpu_detect_x64_win.cpp""")
896
	else:
897
		sources += Split("""#lib/""" + soundtouch_path + """/cpu_detect_x86_win.cpp""")
898
else:
899
	if bitwidth == '64':
900
		sources += Split("""#lib/""" + soundtouch_path + """/cpu_detect_x64_gcc.cpp""")
901
	else:
902
		sources += Split("""#lib/""" + soundtouch_path + """/cpu_detect_x86_gcc.cpp""")
903
904
905
#KissFFT
906
env.Append(CPPPATH=['#lib/kissfft'])
882
env.Append(CPPPATH=['#lib/kissfft'])
907
sources += Split("""#lib/kissfft/kiss_fft.c""")
883
sources += Split("""#lib/kissfft/kiss_fft.c""")
908
884
Lines 1320-1339 Link Here
1320
else:
1296
else:
1321
	print "Agner Fog\'s ASMLIB (http://www.agner.org/optimize)... disabled"
1297
	print "Agner Fog\'s ASMLIB (http://www.agner.org/optimize)... disabled"
1322
1298
1323
# SoundTouch Optimizations -- turn them on only if we have SSE or MMX
1299
#Debugging output
1324
# enabled. It's dumb that they appear here, but they make the most sense next to
1325
# the optimization stuff. It's safe to assume that if opt > 1, then MMX and SSE
1326
# are enabled. All 64-bit CPUs have MMX and SSE as well.
1327
if bitwidth == '64' or (not 'win' in platformString and int(flags['optimize']) > 1) \
1328
    or ('win' in platformString and int(flags['optimize']) > 2):
1329
    sources += Split("""#lib/""" + soundtouch_path + """/mmx_optimized.cpp #lib/""" + soundtouch_path + """/sse_optimized.cpp""")
1330
    env.Append(CPPDEFINES='ALLOW_X86_OPTIMIZATIONS')
1331
1332
# Enable SoundTouch 3DNow! optimizations for Windows (decides at runtime if they're useful)
1333
if 'win' in platformString and not bitwidth == '64':
1334
    sources += Split("""#lib/""" + soundtouch_path + """/3dnow_win.cpp""")
1335
1336
#Debugging output
1337
flags['qdebug'] = getFlags(env, 'qdebug', 0)
1300
flags['qdebug'] = getFlags(env, 'qdebug', 0)
1338
if 'win' in platformString:
1301
if 'win' in platformString:
1339
	if int(flags['msvcdebug']):
1302
	if int(flags['msvcdebug']):

Return to bug 310821