13
0
Commit Graph

319 Commits

Author SHA1 Message Date
0dee3813f9 reintroduce --lv2dir option and LV2DIR value to determine where to install builtin LV2 plugins 2014-01-18 18:21:33 -05:00
83c0720645 remove VAMP and Rubberband from source tree 2014-01-12 15:40:48 -05:00
0a2a6aaabb remove taglib from source tree (require external provision) 2014-01-12 15:40:48 -05:00
5062a00c7d move -fvisibility=hidden to the top of the source tree, and remove its internal use; use libtimecode as a shared lib again 2014-01-12 15:40:47 -05:00
658bb3ccd4 finished merge of cairocanvas with windows and windows+cc branches 2014-01-10 17:11:10 -05:00
3020b224fa Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there 2014-01-10 16:07:57 -05:00
d15fda6d75 fix merge errors with master 2014-01-10 14:53:03 -05:00
Sakari Bergen
f45ec9f87b Add unit test runner (artest) and a config option to run tests after builds 2014-01-08 22:00:34 +02:00
Sakari Bergen
3a59899193 Add -fno-omit-frame-pointer to AddressSanitizer options 2014-01-08 20:35:46 +02:00
36c233fe6c Merge branch 'master' into cairocanvas 2014-01-07 21:37:48 -05:00
Sakari Bergen
bfe0cf9870 Add config option for address sanitizer 2014-01-06 17:04:07 +02:00
1676789907 fix merge conflicts from master 2013-12-12 10:06:59 -05:00
Nils Philippsen
cd7072fdec don't overwrite necessary compiler flags
Distinguish flags influencing optimization (overridable) from those
necessary for building (e.g. for using SSE).
2013-12-09 17:33:45 +01:00
Nils Philippsen
b4cb506cea improve architecture detection
Recognize ppc64, ppc, s390x, s390 CPUs, default to 'none' instead of
i686 (which tries to build with SSE and fails on non-x86 architectures).
2013-12-09 12:16:54 +01:00
60134ddcba remove unnecessary and *nix-centric LANG= from start of command used to get gcc version; use python's platform.uname() rather than os.uname() to get platform information 2013-12-05 14:43:32 -05:00
e5f13d2b94 reorder child dirs to make optionally external dirs more obvious and only test USE_EXTERNAL_LIBS once 2013-11-26 21:53:38 -05:00
08371ae2cf resolve merge with master (?) 2013-11-26 10:24:51 -05:00
fe6c5612a2 Merge branch 'master' into cairocanvas 2013-11-04 16:20:10 -05:00
e24089ec1f do not hard-code version number anymore - define via git or libs/ardour/revision.cc 2013-11-04 14:57:36 -05:00
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
fe14092d57 Merge branch 'master--optional-external-libs' of https://github.com/nphilipp/ardour 2013-10-28 08:54:29 -04:00
Nils Philippsen
85a277c6a3 allow overriding optimization flags completely
If an optimization level ("-O<something>") is present in the argument
for --arch, do not prepend default optimization flags.
2013-10-28 09:32:37 +01:00
Nils Philippsen
5f00d2f3a7 allow linking unbundled versions of some libraries
(libltc, rubberband, taglib, vamp-sdk)
2013-10-28 09:06:09 +01:00
d135c4dc3a fix merge conflicts with master 2013-10-23 08:47:57 -04:00
664e715a00 merge from master 2013-10-22 15:29:44 -04:00
61e66bb763 do not use --tags to get git description/version 2013-10-22 14:51:14 -04:00
f5c386bbb4 add reasonablesynth.lv2
A reasonably simple synth to allow new users to 'hear midi'.
This is a first step. It still needs proper install and bundling.
2013-10-20 04:31:07 +02:00
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
fb313fb174 Merge branch 'master' into windows 2013-10-16 21:57:17 -04:00
75b933eadb Merge remote-tracking branch 'remotes/origin/master' into windows+cc 2013-10-16 15:55:59 +01:00
cfd571f490 bump to 3.5 2013-10-15 13:30:15 -04:00
fa71d82dda Merge branch 'windows' into windows+cc 2013-10-11 18:23:53 +01:00
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
af8a1c146d move JACK configuration test(s) down to where they belong (in libs/backend/jack) 2013-10-08 16:13:39 -04:00
300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
c72748508b the output of git describe --tags is not subject to localization, so we do not need LANG= in the environment when it runs 2013-09-23 13:33:28 -04:00
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
60da662aff Merge branch 'master' into windows 2013-09-14 16:21:32 -04:00
Nils Philippsen
e3b954e16f don't confuse arm with i686 2013-09-13 16:28:04 +02:00
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
f4cf283f26 move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work) 2013-09-07 11:03:57 -04:00
8c5cff6091 Merge branch 'master' into windows 2013-09-06 10:56:36 -04:00
808ee5d139 Only define certain debug flags when dist_target is auto
Fixes issue when cross compiling using MinGW
2013-09-06 14:31:49 +10:00
91b027a4a0 bump to 3.4 2013-09-03 09:08:18 -04:00
0013feddbf Merge branch 'master' into windows 2013-09-03 08:34:27 -04:00
dee91c2c39 Revert "bump to 3.4"
This reverts commit ad7ab8f09a.
2013-09-03 07:59:59 -04:00
f5a60e247e revert to --backtrace enabled by default, since the original goal of this change was addressed in other ways 2013-09-02 22:10:51 -04:00
ad7ab8f09a bump to 3.4 2013-09-02 21:57:40 -04:00
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00