Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 313909
Collapse All | Expand All

(-)src/SConscript.orig (-26 / +3 lines)
Lines 737-745 Link Here
737
else:
737
else:
738
	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
738
	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
739
	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
739
	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
740
	if platform != 'osx':
741
		env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
742
	env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
743
	env.Append(CPPDEFINES = "_REENTRANT")
740
	env.Append(CPPDEFINES = "_REENTRANT")
744
741
745
#Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
742
#Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
Lines 772-800 Link Here
772
769
773
#SoundTouch
770
#SoundTouch
774
#XXX this should be done with a subsconscript
771
#XXX this should be done with a subsconscript
775
env.Append(CPPPATH=['#lib/soundtouch-1.4.1'])
772
sources += Split("""engine/enginebufferscalest.cpp""")
776
sources += Split("""engine/enginebufferscalest.cpp
773
env.Append(CPPPATH = [ ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch' ])
777
                    #lib/soundtouch-1.4.1/SoundTouch.cpp
774
env.Append(LIBS = 'SoundTouch')
778
                    #lib/soundtouch-1.4.1/TDStretch.cpp
779
                    #lib/soundtouch-1.4.1/RateTransposer.cpp
780
                    #lib/soundtouch-1.4.1/AAFilter.cpp
781
                    #lib/soundtouch-1.4.1/FIFOSampleBuffer.cpp
782
                    #lib/soundtouch-1.4.1/FIRFilter.cpp
783
                    #lib/soundtouch-1.4.1/PeakFinder.cpp
784
                    #lib/soundtouch-1.4.1/BPMDetect.cpp
785
                    """)
786
787
if 'win' in platform:
788
	if platform == 'win32':
789
		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_win.cpp""")
790
	if platform == 'win64':
791
		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_win.cpp""")
792
else:
793
	if machine == 'x86_64':
794
		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x64_gcc.cpp""")
795
	else:
796
		sources += Split("""#lib/soundtouch-1.4.1/cpu_detect_x86_gcc.cpp""")
797
798
775
799
#KissFFT
776
#KissFFT
800
env.Append(CPPPATH=['#lib/kissfft'])
777
env.Append(CPPPATH=['#lib/kissfft'])

Return to bug 313909