Merge lp://qastaging/~ulatekh/mixxx/mingw into lp://qastaging/~mixxxdevelopers/mixxx/trunk
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~ulatekh/mixxx/mingw | ||||
| Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk | ||||
| Diff against target: |
2508 lines (+946/-486) 34 files modified
mixxx/build/crossmingw.py (+2/-0) mixxx/build/depends.py (+20/-6) mixxx/build/features.py (+2/-0) mixxx/build/mixxx.py (+21/-10) mixxx/build/nsis/Mixxx.nsi (+6/-0) mixxx/build/qtcreator/mixxx.pro (+616/-367) mixxx/build/qtcreator/protobuf.pri (+39/-0) mixxx/build/unused/create_mixxx_dmg.sh (+0/-10) mixxx/build/unused/mixxx_dmg.sh (+14/-22) mixxx/lib/fidlib-0.9.10/fidlib.c (+2/-2) mixxx/lib/soundtouch-1.6.0/FIFOSampleBuffer.cpp (+2/-1) mixxx/lib/soundtouch-1.6.0/TDStretch.cpp (+2/-1) mixxx/lib/soundtouch-1.6.0/sse_optimized.cpp (+4/-3) mixxx/lib/xwax/lut.cpp (+5/-1) mixxx/lib/xwax/timecoder.h (+8/-0) mixxx/lib/xwax/timecoder_win32.cpp (+4/-0) mixxx/src/SConscript (+141/-50) mixxx/src/analyserbeats.cpp (+8/-1) mixxx/src/analyserqueue.cpp (+4/-0) mixxx/src/controllers/controllermanager.cpp (+2/-0) mixxx/src/dlgprefbeats.cpp (+8/-0) mixxx/src/dlgprefbeats.h (+2/-0) mixxx/src/dlgpreferences.cpp (+2/-0) mixxx/src/library/basesqltablemodel.cpp (+2/-2) mixxx/src/library/browse/foldertreemodel.cpp (+2/-2) mixxx/src/library/treeitemmodel.cpp (+6/-0) mixxx/src/sampleutil.cpp (+3/-2) mixxx/src/util/stat.h (+1/-1) mixxx/src/vamp/vampanalyser.h (+4/-1) mixxx/src/widget/wspinny.cpp (+10/-0) mixxx/vamp-plugins/SConscript (+1/-1) mixxx/vamp-plugins/dsp/DownBeat.h (+1/-1) mixxx/vamp-plugins/dsp/GetKeyMode.h (+1/-1) mixxx/vamp-plugins/dsp/TempoTrackV2.h (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~ulatekh/mixxx/mingw | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mixxx Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
These changes, plus the contents of https:/
Unmerged revisions
- 3385. By Steven Boswell
-
Now copies the libid3tag DLL.
- 3384. By Steven Boswell
-
Now the MinGW build supports shoutcast.
- 3383. By Steven Boswell
-
Now the MinGW build supports vamp, vinylcontrol, and hid, i.e. mingw{32,
64}-phonon. - 3382. By Steven Boswell
-
Compared this branch to trunk, cleaned up some oversights.
Also made sure this branch still compiles and runs on Linux. - 3381. By Steven Boswell
-
Updated the MinGW build for new dependencies libchromaprint and fftw.
Fixed non-VAMP compilation in WSpinny. - 3380. By Steven Boswell
-
Merged with lp:mixxx
- 3379. By Steven Boswell
-
Fixed the MinGW 64-bit build and the MinGW NSIS installer generation!
- 3378. By Steven Boswell
-
The scons-driven MinGW build of Mixxx now links, runs, and creates a proper dist32 directory!
My command line thus far:
scons ladspa=0 shoutcast=0 hifieq=1 script=0 optimize=0 ffmpeg=0 target=windows crosscompile_root=/usr/ i686-w64- mingw32/ sys-root/ mingw hss1394=0 vamp=0 vinylcontrol=0 hid=0 sqlitedll=1 This is working under Fedora Core 18.
I've made a repository for all the files needed to build Mixxx's dependencies under Fedora Core with MinGW:
https://github. com/ulatekh/ fedora- mingw-ardour. git - 3377. By Steven Boswell
-
Now a MinGW build can be made under Linux, with SCons!
- 3376. By Steven Boswell
-
Fixed the display of tracks in the track view!
Now the MinGW build of Mixxx appears to be functional! Further testing will have to reveal problems, because it looks fine!Also removed references to Qt libraries that aren't used any more (Qt3Support, QtSvg, and QtXmlPatterns).
