Merge lp://qastaging/~hile/mixxx/osxbuildfixes into lp://qastaging/~mixxxdevelopers/mixxx/trunk
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~hile/mixxx/osxbuildfixes |
| Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk |
| Diff against target: |
253 lines (+112/-43) 4 files modified
mixxx/build/depends.py (+39/-34) mixxx/build/mixxx.py (+55/-5) mixxx/build/osx/otool.py (+9/-2) mixxx/src/SConscript (+9/-2) |
| To merge this branch: | bzr merge lp://qastaging/~hile/mixxx/osxbuildfixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mixxx Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This patch branch fixes library linking issues building the OS/X version when Qt is not installed to the default version expected, by giving qtdir= variable. Without this patch, qtdir= does not work at all on OS/X (without the patch you must link Qt to now obsolete /Developer/
Also fixes some minor issues in 'bundle package' scons target, specifically install_name_tool failing because the copied file permissions seem to be 0444.
Unmerged revisions
- 3170. By Ilkka Tuohela
-
Improved Qt build directory detection
- 3169. By Ilkka Tuohela
-
Imported from trunk
- 3168. By Ilkka Tuohela
-
Look for Qt frameworks in Frameworks and lib under QTDIR
- 3167. By Ilkka Tuohela
-
Add explicit -L for qt library directory for commercial Qt compilations
- 3166. By Ilkka Tuohela
-
Merged from trunk
- 3165. By Ilkka Tuohela
-
Fix permissions before running install_name_tool
- 3164. By Ilkka Tuohela
-
Removed accidentally added presetinfo
- 3163. By Ilkka Tuohela
-
Imported OS/X build fixes
