Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22040/src
Modified Files: Tag: devel_0_39 SConscript Log Message: adapted scons script for athlon-xps ...
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.17 retrieving revision 1.1.4.18 diff -C2 -d -r1.1.4.17 -r1.1.4.18 *** SConscript 5 Aug 2005 14:16:10 -0000 1.1.4.17 --- SConscript 22 Aug 2005 16:27:27 -0000 1.1.4.18 *************** *** 11,14 **** --- 11,15 ---- BoolOption('debug', 'Build with debugging symbols', False), BoolOption('nosimd', 'Build without simd instructions', False), + BoolOption('noDAZ', 'Build DAZ on x86 (for athlon-xp)', False), BoolOption('portaudio', 'Build with portaudio', True), BoolOption('threadedsf', 'Build with threaded soundfiler', False), *************** *** 304,309 **** if alsa: linux_sources.append(alsa_sources) ! pa_linux_sources.append('../portaudio/pa_linux_alsa/pa_linux_alsa.c') ! linux_defs.append("USEAPI_ALSA PA_USE_ALSA") linux_libs.append('asound') linux_sources.append(['s_midi_alsa.c']) --- 305,311 ---- if alsa: linux_sources.append(alsa_sources) ! linux_sources.append('../portaudio/pa_linux_alsa/pa_linux_alsa.c') ! linux_defs.append("USEAPI_ALSA") ! linux_defs.append("PA_USE_ALSA") linux_libs.append('asound') linux_sources.append(['s_midi_alsa.c']) *************** *** 397,402 **** if not pdenv['nosimd']: ! if pdenv['PLATFORM'] != 'darwin': ! flags += " -mfpmath=sse -mmmx -msse -msse2 -fprefetch-loop-arrays" else: flags += " -faltivec -maltivec" --- 399,404 ---- if not pdenv['nosimd']: ! if pdenv['PLATFORM'] != 'darwin': ! flags += " -mfpmath=sse -mmmx -msse -fprefetch-loop-arrays" else: flags += " -faltivec -maltivec" *************** *** 406,413 **** flags += " -mms-bitfields" ## binary compatibility with msvc
- pdenv.Append(CCFLAGS=flags) - pdenv.Append(CXXFLAGS=flags) - pdenv.Append(LINKFLAGS=flags) - ###################################################################### # --- 408,411 ---- *************** *** 416,422 **** conf = pdenv.Configure()
! if conf.TryCompile("""#include "xmmintrin.h" """, '.c'): ! pdenv.Append(CPPDEFINES='DAZ') ! if conf.TryCompile("""#include "stdlib.h" int main() --- 414,422 ---- conf = pdenv.Configure()
! if not pdenv['nosimd'] and pdenv['PLATFORM'] != 'darwin': ! if not pdenv['noDAZ']: ! pdenv.Append(CPPDEFINES='DAZ') ! flags += "-msse2" ! if conf.TryCompile("""#include "stdlib.h" int main() *************** *** 429,432 **** --- 429,437 ----
+ pdenv.Append(CCFLAGS=flags) + pdenv.Append(CXXFLAGS=flags) + pdenv.Append(LINKFLAGS=flags) + + ###################################################################### ######################################################################