13
0
Commit Graph

470 Commits

Author SHA1 Message Date
f3ff1b9669 weak/runtime jack linking: load libjack dynamically at runtime 2014-10-23 16:53:13 +02:00
e2c6eb0ba1 silence clang ‘unused include file/compiler flag’ warnings 2014-10-23 03:43:04 +02:00
892909b052 separate host and target (OSX) 2014-10-19 23:13:50 +02:00
6970972191 add OSX 10.9 version flags
TODO: here, Xcode 6.0.1 and OS10.9.5  mmacosx-version-min=10.5 works
and produces binaries compatible with 10.5 or later, but that may 
no be standard. - Please x-check, for now 10.8 should work everywhere.
2014-10-16 16:16:41 +02:00
6794a4d020 add explanatory comment for future historians 2014-10-07 10:57:08 -04:00
a7da906a79 NOOP, proper label for flat carbon header includes 2014-10-07 16:53:10 +02:00
7bfa25777b OSX 10.9.5 compile fixes - part one 2014-10-07 14:46:06 +02:00
d1564669cf windows application icon 2014-10-05 02:12:25 +02:00
aeda6cbea9 add --with-wavesbackend config option (disabled by default) 2014-10-01 18:28:47 +02:00
b69f86b795 also build clearerlooks for windows 2014-10-01 00:13:17 +02:00
e1e4f9c9dd revert stupid change that breaks python3 and was probably related to other python-related issues fixed when support for python3 was added to our wscript files 2014-09-29 21:38:08 -04:00
dfec51964d fix small thinko with --no-lxvst option 2014-09-17 10:25:57 -04:00
beb0b3a6a7 add --no-lxvst option 2014-09-10 20:55:32 +02:00
9ad3feaba0 rename system and user config files with product-neutral names 2014-09-07 10:20:29 -04:00
885f1c71ec Remove unused variables (fix warnings). 2014-08-31 17:54:16 -04:00
692f69ba14 parameterize the version number used to define the config directory name 2014-07-16 08:15:18 -04:00
97a99f545f fix attempt at making -framework Accelerate arguments work correctly 2014-07-15 10:42:10 -04:00
d6f2b9561a fix argument list for -framework Accelerate on OS X (arguments were fused into a single string) 2014-07-15 10:19:26 -04:00
e8106bb415 minor fixes to wscript files to make things python3 compatible 2014-07-13 08:36:18 -04:00
39ea166620 add --debug-symbols configure option.
This allows for --optimize --debug-symbols for profiling.
2014-07-08 18:40:52 +02:00
e21907d247 make WINDOWS_KEY value propagate correctly into wscript files for use when generating key bindings 2014-07-08 00:53:13 -04:00
cd57e14cf3 Fix install path of ardour_system.rc 2014-06-07 13:49:11 +10:00
27f8fc90cf mark dbus reservation tool optional 2014-06-05 03:26:52 +02:00
a907d3455e break out ALSA related functions into libardouralsautil 2014-06-04 19:16:37 +02:00
745c3cce1d fix wscript for x-compiling 2014-06-03 02:06:22 +02:00
d5fa80e01d fix linking against libasound 2014-06-02 21:09:21 +02:00
432f54db24 make ALSA backend optional and disable by default 2014-06-02 20:33:12 +02:00
796f4e9711 make building the dummy backend be a configure-time option. defaults to False for the time being 2014-05-28 22:30:06 -04:00
317a6c7f99 fix wscript to handle git revision ID that consists of just MAJOR.MINOR, as will happen if the repo is at the exact same rev as the MAJOR.MINOR tag 2014-05-28 15:53:36 -04:00
1b515fd0ff really fix osx mavericks detection 2014-05-25 00:21:20 +02:00
331b23cd05 fix script breakage 2014-05-24 16:20:58 -04:00
298ce8fdbf osx 10.9 needs c++11 (it's now default and used for the build-stack) 2014-05-24 20:10:14 +02:00
1c57dbfb3b fix typo link*er*_flags for OSX w/c++11 2014-05-24 20:10:13 +02:00
95ccbc452f Merge branch 'noppc' of https://github.com/mojofunk/ardour into cairocanvas 2014-05-19 17:45:01 -04:00
fd2409f90c There will be no supported PPC build of Ardour3 so remove powerpc optimization section 2014-05-14 10:46:07 +10:00
a3c88efa61 Remove Mac Universal build option as it is no longer supported 2014-05-14 10:45:53 +10:00
da596182e1 Remove duplicate test for presence of boost header 2014-05-14 09:47:40 +10:00
058986f77b finish unfinished work at basing all install paths on the program name 2014-04-28 21:11:08 -04:00
2974c87684 parameterize install target directories based on --program-name configure option 2014-04-10 10:23:16 -04:00
716c5b0642 new configure option for trx build, which also generates new menus file 2014-04-10 05:58:49 -04:00
543099afba rework SystemExec - use vfork wrapper (and lots of related stuff) 2014-03-13 16:58:07 +01:00
495c0de4ac fix up waf build in wake of search path changes earlier today 2014-03-10 17:30:12 -04:00
1c839ed541 some more mingw x-compile fixes 2014-03-04 18:53:43 +01:00
912f07b919 mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64) 2014-03-04 15:25:58 +01:00
9952f774e9 some mingw related tweaks to the build-environment. 2014-03-03 16:09:14 +01:00
993ed56701 prepare standalone VST scanner tool.. part one 2014-02-25 14:57:57 +01:00
6f759b5650 add headless to child list for wscript 2014-02-24 14:47:00 -05:00
2a7ed69c28 merge with master, with minor conflict fixes 2014-02-07 19:00:44 -05:00
ed75b9425b make backtrace symbols work again inside gtk2_ardour (-rdynamic is a link-time flag, not compile-time 2014-02-07 15:25:18 -05:00
c11bf0cc72 make -fvisibility=hidden be controlled by ./waf configure --exports-hidden 2014-01-31 10:25:58 -05:00
0b9b895b8d current mingw actually calls libpthread libpthread 2014-01-31 10:25:58 -05:00
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
cc92c879bf Merge branch 'master' into ccmerge
Conflicts:
	gtk2_ardour/ardour_ui_options.cc
	gtk2_ardour/generic_pluginui.cc
	gtk2_ardour/level_meter.cc
	gtk2_ardour/utils.cc
	gtk2_ardour/utils.h
	gtk2_ardour/video_image_frame.cc
2013-08-10 15:41:40 +02:00
3f423339bc add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs() 2013-08-08 15:26:18 -04:00
56020b8f8c bump actual publically visible version (oops) 2013-08-08 15:23:10 -04:00
Michael R. Fisher
d872a0a31b Add c++11 enablement options in wscript
- adds "--cxx11" toggle for ./waf configure
- The switch adds appropriate compiler flags and tests the compiler
  for usability of c++11
- This 'should' be compatible for linux, osx, and windows systems
  that have gcc and/or clang with support c++11
2013-08-08 15:23:10 -04:00
d9862364be Add --single-tests option to also build each libardour test as a separate program 2013-08-08 15:23:08 -04:00
897074730a remove --no-freesound option. fixes #5640 2013-08-08 20:08:20 +02:00
bb8cb93789 Merge branch 'master' into windows 2013-08-01 10:44:58 -04:00
0bd09a0e23 add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs() 2013-08-01 10:10:21 -04:00
ed9dd5ca62 Enable lxvst support by default and then disable for build targets that don't support it 2013-07-22 13:41:14 +10:00
56a6f52856 Remove lxvst variable from wscript that was no longer in use 2013-07-22 13:41:14 +10:00
d0deae357b Remove tools/sanity_check dir from build in mingw cross compile
This is already added to build further down. I believe this is result of
a partially applied patch.
2013-07-22 13:41:14 +10:00
1e9301a713 Define PLATFORM_WINDOWS and COMPILER_MINGW when dist target is set to mingw 2013-07-22 13:41:14 +10:00
650964f320 Merge branch 'master' into windows 2013-07-17 08:05:59 -04:00
fc0053a721 bump actual publically visible version (oops) 2013-07-16 18:54:45 -04:00
Michael R. Fisher
cdef4aa50f Add c++11 enablement options in wscript
- adds "--cxx11" toggle for ./waf configure
- The switch adds appropriate compiler flags and tests the compiler
  for usability of c++11
- This 'should' be compatible for linux, osx, and windows systems
  that have gcc and/or clang with support c++11
2013-07-15 22:57:35 -05:00
590e1fb458 Disable check for boost with mingw build 2013-07-15 13:43:47 -04:00
00ae5492f4 (reapply with fixes) Build system changes to support mingw build target 2013-07-15 13:43:17 -04:00
96ea407d1a Revert "Build system changes to support mingw build target"
This reverts commit 94145732f3.
2013-07-15 13:21:22 -04:00
555174d510 Revert "tweaks to mingw build environment"
This reverts commit fa09121a7f.
2013-07-15 13:20:48 -04:00
fa09121a7f tweaks to mingw build environment 2013-07-15 13:17:32 -04:00
94145732f3 Build system changes to support mingw build target 2013-07-15 13:16:09 -04:00
7a5118f403 Add --single-tests option to also build each libardour test as a separate program 2013-07-11 10:57:21 -04:00
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
4a7c615714 fix issue with wscript on OS X caused by earlier removal of AU_STATE_SUPPORT; in config summary use NO_PLUGIN_STATE not removed AU_STATE_SUPPORT 2013-06-25 11:09:47 -04:00
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
80a13145f3 Generalize no-plugin-state from AudioUnits to all plugins
Replace AU_STATE_SUPPORT compile-time define with NO_PLUGIN_STATE and make it prevent plugin state setting, preset loading, preset saving and plugin state saving. Blocks on these actions exist partially in the backend and partially in the GUI (this latter class are not absolute, and should OSC or MIDI be able to drive Plugin::save_preset() the block could be circumvented). Set NO_PLUGIN_STATE if --freebie is used at waf-configure time
2013-06-13 22:50:54 -04:00
a1e3cee926 bump to v3.2 2013-06-13 10:53:51 -04:00
2e1e5da78e more changes to consolidate version definition into the top level wscript file 2013-06-11 11:37:52 -04:00
31d234b48c Merge branch 'master' into cairocanvas 2013-06-07 13:18:48 -04:00
53c6c714cd disable symbol export -- fix LinuxVST issue
-rdynamic:  Pass the flag -export-dynamic to the ELF linker,
 on targets that support it. This instructs the linker to add
 all symbols, not only used ones, to the dynamic symbol table.
 This option is needed for some uses of dlopen or to allow
obtaining backtraces from within a program.

Some LinuxVST pluging cause ardour3 to crash -- if ardour is linked with
-rdynamic (see #ardour log from 2013-jun-6). This is likely compiler
specific and not a problem on las' build-machine (gcc 4.5.5) which is
why the linux-packaging script enables it by default.
The issue can be reproduced reliably with gcc 4.7.2 and 4.6.3. Although
it is yet unclear if it is caused by g++/ld or related to other factors
of the build-system...
2013-06-06 21:27:07 +02:00
bebe2af95a merge with master 2013-05-08 14:48:28 -04:00
cadfc2aee1 various miscellany related to versions, gtk2 build and packaging 2013-05-08 13:16:50 -04:00
e8301185c0 a few minor changes required to get a DMG to build (on Tiger, at least) 2013-05-07 12:21:42 -04:00
6ae4f10437 Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor.h
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/wscript
2013-04-11 22:24:05 +02:00
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
bca507a808 Merge branch 'master' into cairocanvas 2013-04-09 14:23:41 -04:00
d79e3a21c6 bump to 3.1 2013-04-08 12:00:29 -04:00
30968b8542 merge with master, including manual merge conflict resolution 2013-04-06 16:12:15 -04:00
2a1b4bff48 do not include templates in a distributed version of ardour, they are useless. see the comments in templates/wscript on why this is so, and why this change was made 2013-04-06 11:37:16 -04:00
b023273d01 add pkg-config check on liblo, now that NSM support requires 0.26 rather than just "any" version (fixes #5435) 2013-04-06 09:29:54 -04:00
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
9eaefe3d12 remaining part of static library commit, should have been a part of 16ce39c230 2013-03-20 17:22:32 -04:00
Julien de Kozak
eb7a85b8f9 Set the revision mechanism independent from the VCS name 2013-03-18 20:13:05 +01:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
d957bf7a28 print the git version on build 2013-03-13 19:13:00 +01:00
59c74e675c git revision extraction 2013-03-12 17:44:48 +01:00
224edbeb15 remove debug output from wscript
git-svn-id: svn://localhost/ardour2/branches/3.0@14213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-11 09:06:07 +00:00
25b934406a removal manual tree from source code, since this has its own website and git repo now
git-svn-id: svn://localhost/ardour2/branches/3.0@14212 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-11 09:05:39 +00:00
903c29d07d add pseudo-target "tarball" needed in order to build source tarballs correctly
git-svn-id: svn://localhost/ardour2/branches/3.0@14209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-10 20:22:26 +00:00