← Back to branch summary

~mixxxdevelopers/mixxx/trunk

« back to all changes in this revision

Viewing changes to mixxx/build/depends.py

  • Committer: RJ Ryan
  • Date: 2012-03-12 05:23:47 UTC
  • mfrom: (2840.2.23 mixxx-setlog)
  • Revision ID: rryan@mit.edu-20120312052347-ej5ryah1p3nag2dq
Merging Daniel Schürmann's session history branch into lp:mixxx. Thanks Daniel!

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/build/depends.py
236
236
        # SoundTouch CPU optimizations are only for x86
237
237
        # architectures. SoundTouch automatically ignores these files when it is
238
238
        # not being built for an architecture that supports them.
239
 
        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else '#lib/%s/cpu_detect_x86_gcc.cpp'
 
239
        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
 
240
                '#lib/%s/cpu_detect_x86_gcc.cpp'
240
241
        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
241
242
        return sources
242
243
 
415
416
                   "library/preparefeature.cpp",
416
417
                   "library/autodjfeature.cpp",
417
418
                   "library/mixxxlibraryfeature.cpp",
 
419
                   "library/baseplaylistfeature.cpp",
418
420
                   "library/playlistfeature.cpp",
 
421
                   "library/setlogfeature.cpp",
419
422
 
420
423
                   "library/browse/browsetablemodel.cpp",
421
424
                   "library/browse/browsethread.cpp",
473
476
                   "library/parser.cpp",
474
477
                   "library/parserpls.cpp",
475
478
                   "library/parserm3u.cpp",
 
479
                   "library/parsercsv.cpp",
476
480
 
477
481
                   "bpm/bpmscheme.cpp",
478
482