Commit Graph

670 Commits

Author SHA1 Message Date
Paul Davis 6b61d58b8a at the end of waf configure, when displaying selected options, break backend settings into their own "output block" 2016-01-12 08:06:48 -05:00
Paul Davis baeca3642b add relevant wscript visibility for the portaudio backend 2016-01-12 08:06:48 -05:00
Paul Davis 90c4985604 remove wavesaudio backend 2016-01-12 08:06:47 -05:00
Robin Gareus 91f5cd008c amend prev commit (fix typos) 2015-12-17 21:04:08 +01:00
Robin Gareus bdfddec6fc more hot wine. 2015-12-17 20:22:02 +01:00
Robin Gareus b228c11311 commandline session utilities 2015-12-16 00:25:07 +01:00
David 6b00ff6198 Add option to use libc++ instead of libstdc++ 2015-12-12 15:02:00 +01:00
David 0e1ce02941 Add support for El Capitan 2015-12-10 20:25:49 +01:00
Robin Gareus e5136d0375 add a mixbus compile define
allow to minimize branch changes downstream and work closer with upstream.
(so far upstream #ifdef MIXBUS were hardcoded to #if 1 downstream)
2015-12-10 12:36:03 +01:00
Robin Gareus 68d3b45976 improve itstool detection:
handle "/bin/sh: 1: itstool: not found" cases.
2015-12-05 14:04:11 +01:00
Robin Gareus 9a058672ab disable pthread-w32 semaphores for now
Two major changes: semaphore AND callback based portaudio on one day
are not great for testing.
2015-12-03 18:41:57 +01:00
Robin Gareus 4245f2a02b fix pthread-windows semaphore detection 2015-12-02 15:07:33 +01:00
Robin Gareus 14d6470ad3 prefer pthread-semaphores (posix API) with mingw
Hopefully this resolves glitches on hyperthreading machines.
Apart from using unnamed Semaphores, pthread-w32 includes additional locks
(guess: mem-barriers), a fallback implementation and windows-specific
tricks that I'd rather not want to know about :)
2015-12-02 13:59:48 +01:00
Robin Gareus 73d1de3b75 NOOP, remove trailing whitespace, replace tabs in python scripts 2015-11-29 17:54:31 +01:00
Robin Gareus dc78fcfb2f check for itstool (>= 1.0.4, -j option) 2015-11-25 16:36:37 +01:00
Paul Davis 6d08797297 update configure time tests and code to use libsndfile 1.0.26's version of the R64 auto-downgrade-to-WAV code 2015-11-24 08:45:10 -05:00
Tim Mayberry 3a266ff5e8 Add --profile waf option so frame pointer isn't omitted in optimized builds 2015-11-18 09:38:18 +10:00
Tim Mayberry bb5b0a6d8a Remove -O0 optimize flag from debuggable flags to enable debuggable optimized builds
This allows debug symbol information to be included for optimized builds. This
may not always be useful for debugging but it is necessary to use profiling
tools like perf.

The default optimize level is -O0 if no other optimize flag is specified so the
optimization level will be the same unless overridden.
2015-11-18 09:38:18 +10:00
nick_m 0956708aa9 Build freedesktop files if requested. 2015-10-23 02:21:01 +11:00
Robin Gareus 6ff50d2140 fix OS X system detection (amend 66704ee) 2015-10-18 23:19:52 +02:00
Robin Gareus c799ef723d remove outdated limiation 2015-09-28 15:40:26 +02:00
Robin Gareus ba6e274efa new tool to test gcc4/5 ABI 2015-09-26 19:03:22 +02:00
Robin Gareus 0613b7517c gcc5/c++11 deprecates std::auto_ptr 2015-09-26 00:22:56 +02:00
Robin Gareus 67aa2f8763 fix bundled LV2 plugin deployment.
Ardour Application bundles use uppercase LV2, consistent with LV2 
"the name" on http://lv2plug.in/  and the recommendation for OSX & Win
on http://lv2plug.in/pages/filesystem-hierarchy-standard.html/

Since this is for internal-use only, so we do not need to follow the lowercase Unix recommendation.
2015-09-14 03:24:21 +02:00
Paul Davis 5f6d8aded3 configure time detection of a patch/feature of libsndfile not yet in release 2015-09-08 17:40:28 -04:00
Robin Gareus 0fd9845957 more python2/3 compat 2015-08-23 00:00:19 +02:00
Robin Gareus 88920232e9 support the young serpents 2015-08-21 16:35:21 +02:00
Tim Mayberry 95c5b99efc Remove duplicate code in wscript after merge 2015-08-17 22:01:20 +10:00
Guy Sherman 4f387f390e Tweaked build and run for windows
Quotes were appearing around the version number. Modified wscript to
remove quotes from VERSION and PROGRAM_VERSION.

One of the places windows looks for DLLs is in directories
listed in PATH. A new file called ardev-win which sets up the
contents of PATH and LD_LIBRARY_PATH as required.
2015-08-16 18:01:28 +02:00
Paul Davis c2d6249370 provide a mechanism for ./waf dist to work without hardcoding APPNAME in wscript 2015-08-13 14:32:38 -04:00
Robin Gareus 4666711639 python /^x86_64/ does not match 'x86_64-w64-mingw32-gcc' so what.. 2015-08-12 07:07:21 +02:00
Robin Gareus 9ab17635f3 regexp fun 2015-08-12 06:22:50 +02:00
Damien Zammit d686cb213f Added PT .ptf session audio import functionality
Signed-off-by: Damien Zammit <damien@zamaudio.com>
2015-08-06 00:28:35 +02:00
Paul Davis 1e169ea3e8 fix wscripts to work with python3.
encode/decode return byte arrays in python3, not strings
2015-07-06 10:06:06 -04:00
Robin Gareus 7a7c87d5f4 remove tabs from python code 2015-07-05 14:50:13 +02:00
Paul Davis 5d45ccf970 Revert "experimentally remove some C++11 flags (likely to return)"
This reverts commit a27ad61695053fc18a9630dd9e7c2418416ba915.

This was not a fix for the problem it was an attempt to fix.
2015-06-29 14:18:15 -04:00
Paul Davis 2b2e6a94dc experimentally remove some C++11 flags (likely to return) 2015-06-29 14:18:15 -04:00
Paul Davis 3a8bb36e28 ensure that program version strings are not unicode 2015-06-29 14:18:15 -04:00
Paul Davis 6485300479 remove more explicit compiler flags by placing them in the compiler flags dictionary 2015-06-29 14:18:14 -04:00
Paul Davis 751d330dbb store compiler flags in conf/bld context object so that we can use them selectively at build time 2015-06-29 14:18:13 -04:00
Paul Davis 6410aa896f Added optimized AVX function for sample processing
Added AVX versions of existing 5 SSE functions. Added 6th AVX function to copy vectors which is 1.5 times faster then memcpy.
Data consistency and validness  is fully tested after processing with new AVX functions on aligned and non aligned buffers.
2015-06-29 14:18:13 -04:00
Paul Davis c912bd61ae tracks build ... backends are hard-coded 2015-06-29 14:18:10 -04:00
Paul Davis 87cfd47818 add now-expected -D defines for a Tracks build 2015-06-29 14:18:10 -04:00
Paul Davis d682c42d5a better implementation of configure and build time is_tracks_build() test 2015-06-29 14:18:10 -04:00
Paul Davis e1bd9401d5 add clean and nice check for Tracks builds 2015-06-29 14:18:10 -04:00
Paul Davis 9632600819 define PROGRAM_NAME in waf conf/bld objects, to allow program-dependent stuff at the wscript level 2015-06-29 14:16:43 -04:00
Paul Davis 017e580c9f add stacktrace() support for Windows (Grygorii Zharun) 2015-06-29 14:16:42 -04:00
Christopher Arndt a9bc95a911 Fix mixed spaces/tabs in wscripts 2015-05-03 19:52:38 +02:00
Paul Davis f755185825 add a real check for functioning JACK metadata API; remove configure time option for this 2015-04-23 09:29:45 -04:00
Paul Davis 187ddb3bad more windows related SSE build fixes 2015-04-21 13:28:17 -04:00
Paul Davis 696100651d fix another recent error in wscript for windows 2015-04-21 12:21:57 -04:00
Paul Davis eabce90f29 fix recent error in wscript for windows 2015-04-21 12:19:01 -04:00
Greg Zharun 8af992c449 [Summary] Added SSE sound processing functions support for Windows. Version 1.
Conflicts:
	wscript
2015-04-21 10:49:00 -04:00
Robin Gareus 69e41c3b38 disable -rdynamic by default
see man 3 dlopen. Ideally we’d use RTLD_DEEPBIND,
but it’s neither portable and rather new (glibc 2.3.4).

This fixes issues with symbol conflicts in plugins
e.g. http://pastebin.com/FkFkf3Mm  (plugin expects
its own OSC[illator?] class but gets ardour’s
OpenSoundControl instead).
2015-04-15 20:31:27 +02:00
Robin Gareus 2bbe4baf29 windows can’t rename open files.
This needs a better solution after 4.0.
2015-04-07 05:25:24 +02:00
Paul Davis c313ec29d6 change the compile flags set by the --freebie configure option to enable silence-after-seconds 2015-04-05 14:03:18 -04:00
Robin Gareus a842a69c16 allow to prefix tags with “<text>+”
eg. mixbus+3.0 or mb+3.1-rc1
2015-04-02 23:42:28 +02:00
Robin Gareus c7216e03f1 small tool to dump default config. 2015-03-22 22:15:37 +01:00
Robin Gareus 1199fe2f90 fix OSX/Clang optimized builds
not quite sure how -fomit-frame-pointer can make a difference with 64bit
builds, but it does crash on start in 
gdk_window_new -> .. -> [NSColor _controlColor] -> GetThemeImage
-> _NSAppKitThemeLock  with no other threads involved.

full backtrace: http://pastebin.com/FxsCMzSY
2015-03-10 14:32:06 +01:00
Robin Gareus 9107a4b7fe add a no-jack-metadata option for poor 12.04 souls
(jack does have metadata support but ubuntu packaged
a version with a wrong header)
2015-03-08 21:31:08 +01:00
Robin Gareus 80ccd280b5 I’m starting to regret these checks.. 2015-03-07 16:15:41 +01:00
Robin Gareus 3dac4b760b fix linux detection 2015-03-07 10:54:37 +01:00
Robin Gareus 3b941fc0fa build system tweaks for coreaudio/waves-coreaudio 2015-03-06 23:26:05 +01:00
Robin Gareus 8ed5633367 fix osx version detection in da975ae 2015-02-25 21:11:55 +01:00
Robin Gareus da975ae27b allow carbon support on 10.6, 32bit 2015-02-25 20:50:41 +01:00
Paul Davis 7ef0df7904 Revert "use product-neutral name for LV2 install dir"
This reverts commit 44ca3c948c.
2015-01-22 11:38:28 -05:00
Paul Davis 44ca3c948c use product-neutral name for LV2 install dir 2015-01-21 21:20:15 -05:00
Robin Gareus dfba00766c fix bundled LV2 installation path (waf install) 2015-01-20 18:07:43 +01:00
Robin Gareus c1ccf8e28e prepare for release candidate tags:
regexp: /[0—9]+-[0-9]+(-rc[0-9]*)?/
<Major>-<Minor>[-rc[<num>]]
valid tag examples: 4.0, 4.1-rc3, 5.0-rc
2015-01-08 20:18:09 +01:00
Robin Gareus 659c0d093d remove hardcoded major version in build scripts 2015-01-08 17:59:41 +01:00
Robin Gareus c16d520338 prepare for 'ardour4' 2015-01-05 19:07:24 +01:00
Tim Mayberry 50c4385b6b Increase minimum required Glib version to 2.28 for g_get_monotonic_time 2015-01-02 22:11:59 +07:00
Tim Mayberry 1da30faf7f Add tests that show the timing differences between the Glib/mm based timeouts
This shows that PBD::Timer is pretty much identical in terms of timing and CPU
usage as Glib TimeoutSources.

They also show the differences on Windows when setting the minimum Multimedia Timer
resolution using timeBeginPeriod
2015-01-01 19:04:09 +07:00
David Robillard 2e7cfe081f Add --no-lrdf configure option. 2014-12-24 13:00:32 -05:00
Paul Davis a3fcc02644 fix spelling error in MSVC compiler flags dictionary 2014-12-22 14:05:40 -05:00
John Emmas 1eda0bac19 Add some preliminary options for building with msvc and waf 2014-12-22 17:41:02 +00:00
John Emmas 92376a657d Don't check for 'dlopen' or 'dlfcn.h' if we're building with MSVC 2014-12-22 17:38:30 +00:00
Robin Gareus 09687c1712 allow generic i386 builds with OSX/clang 2014-12-18 10:25:39 +01:00
Robin Gareus a45259b783 fix —optimize and —debug-symbols configure flags
“execv() arg 2 must contain only strings”
2014-12-18 10:22:45 +01:00
David Robillard d36b5c78bd Nuke user CFLAGS/CXXFLAGS if debug is set. 2014-12-18 02:26:51 -05:00
Robin Gareus ea9cdaa57a add missing quotes 2014-12-17 22:51:11 +01:00
Paul Davis a280f28af9 potentially a better check for MSVC 2014-12-17 14:09:18 -05:00
Paul Davis 9e67d18ad8 remove debug output 2014-12-17 14:08:33 -05:00
Paul Davis 8568cb9d8b new wscript using compiler flags dictionary and very basic provision for msvc 2014-12-17 13:59:00 -05:00
Paul Davis 246a4f3018 correct install location for .mo files (i18n) and cleanup LOCALEDIR use a bit 2014-12-09 08:19:11 -05:00
Robin Gareus df92e33cc5 fix typo in wscript 2014-12-06 02:42:14 +01:00
Julien de Kozak 036b6234ac Relax VAMP version from 2.4 to 2.1 2014-12-01 23:18:10 +01:00
Tim Mayberry b9be8d2652 Replace individual waf options for enabling backends with one --with-backends option 2014-11-26 22:47:05 +07:00
Robin Gareus 421a1d9912 Revert "Don't add non-clang flag regardless of platform."
Apple's g++ on 10.6. does not understand -Wno-unused-local-typedefs
either

This reverts commit 9dd8024e41.
2014-11-25 14:06:15 +01:00
David Robillard a2475509e5 Check for clang with an actual code check.
Turns out Apple in its infinite wisdom installs clang as /usr/bin/g++, so
guessing based on executable name doesn't work.
2014-11-25 02:20:21 -05:00
David Robillard 8b268344f9 Shup up clang about gtkmm/papertraits.h. 2014-11-25 02:08:35 -05:00
David Robillard 9dd8024e41 Don't add non-clang flag regardless of platform. 2014-11-25 02:07:40 -05:00
David Robillard 634a348296 Fix clang check for versioned clang executables. 2014-11-25 02:07:07 -05:00
Robin Gareus 7b3263891f waf is fun 2014-11-24 04:56:31 +01:00
Robin Gareus 2bdf9e447f OSX gcc does not support local-typedef warning 2014-11-24 04:24:58 +01:00
Robin Gareus 3aea7af3fd lost quote 2014-11-24 00:00:58 +01:00
Robin Gareus 5aba4df252 fix/silence various compiler warnings.
* ifdef unused static functions
* brackets around assignment and comparision
* no return statement in function returning non-void
* boost concept_checks.hpp unused-local-typedefs
2014-11-23 23:57:55 +01:00
Robin Gareus b630cc81bc the return of the PPC nostalgia 2014-11-14 08:16:25 +01:00
Robin Gareus b04414d170 allow to use cairo-image/software surface for canvas & cairowidgets 2014-10-28 02:15:10 +01:00
Robin Gareus b23c29c204 fix gcc/C++11 2014-10-25 22:00:47 +02:00
Robin Gareus f3ff1b9669 weak/runtime jack linking: load libjack dynamically at runtime 2014-10-23 16:53:13 +02:00
Robin Gareus e2c6eb0ba1 silence clang ‘unused include file/compiler flag’ warnings 2014-10-23 03:43:04 +02:00
Robin Gareus 892909b052 separate host and target (OSX) 2014-10-19 23:13:50 +02:00
Robin Gareus 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
Paul Davis 6794a4d020 add explanatory comment for future historians 2014-10-07 10:57:08 -04:00
Robin Gareus a7da906a79 NOOP, proper label for flat carbon header includes 2014-10-07 16:53:10 +02:00
Robin Gareus 7bfa25777b OSX 10.9.5 compile fixes - part one 2014-10-07 14:46:06 +02:00
Robin Gareus d1564669cf windows application icon 2014-10-05 02:12:25 +02:00
Robin Gareus aeda6cbea9 add --with-wavesbackend config option (disabled by default) 2014-10-01 18:28:47 +02:00
Robin Gareus b69f86b795 also build clearerlooks for windows 2014-10-01 00:13:17 +02:00
Paul Davis 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
Paul Davis dfec51964d fix small thinko with --no-lxvst option 2014-09-17 10:25:57 -04:00
Robin Gareus beb0b3a6a7 add --no-lxvst option 2014-09-10 20:55:32 +02:00
Paul Davis 9ad3feaba0 rename system and user config files with product-neutral names 2014-09-07 10:20:29 -04:00
David Robillard 885f1c71ec Remove unused variables (fix warnings). 2014-08-31 17:54:16 -04:00
Paul Davis 692f69ba14 parameterize the version number used to define the config directory name 2014-07-16 08:15:18 -04:00
Paul Davis 97a99f545f fix attempt at making -framework Accelerate arguments work correctly 2014-07-15 10:42:10 -04:00
Paul Davis 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
Paul Davis e8106bb415 minor fixes to wscript files to make things python3 compatible 2014-07-13 08:36:18 -04:00
Robin Gareus 39ea166620 add --debug-symbols configure option.
This allows for --optimize --debug-symbols for profiling.
2014-07-08 18:40:52 +02:00
Paul Davis e21907d247 make WINDOWS_KEY value propagate correctly into wscript files for use when generating key bindings 2014-07-08 00:53:13 -04:00
Tim Mayberry cd57e14cf3 Fix install path of ardour_system.rc 2014-06-07 13:49:11 +10:00
Robin Gareus 27f8fc90cf mark dbus reservation tool optional 2014-06-05 03:26:52 +02:00
Robin Gareus a907d3455e break out ALSA related functions into libardouralsautil 2014-06-04 19:16:37 +02:00
Robin Gareus 745c3cce1d fix wscript for x-compiling 2014-06-03 02:06:22 +02:00
Robin Gareus d5fa80e01d fix linking against libasound 2014-06-02 21:09:21 +02:00
Robin Gareus 432f54db24 make ALSA backend optional and disable by default 2014-06-02 20:33:12 +02:00
Paul Davis 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
Paul Davis 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
Robin Gareus 1b515fd0ff really fix osx mavericks detection 2014-05-25 00:21:20 +02:00
Paul Davis 331b23cd05 fix script breakage 2014-05-24 16:20:58 -04:00
Robin Gareus 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
Robin Gareus 1c57dbfb3b fix typo link*er*_flags for OSX w/c++11 2014-05-24 20:10:13 +02:00
Paul Davis 95ccbc452f Merge branch 'noppc' of https://github.com/mojofunk/ardour into cairocanvas 2014-05-19 17:45:01 -04:00
Tim Mayberry fd2409f90c There will be no supported PPC build of Ardour3 so remove powerpc optimization section 2014-05-14 10:46:07 +10:00
Tim Mayberry a3c88efa61 Remove Mac Universal build option as it is no longer supported 2014-05-14 10:45:53 +10:00
Tim Mayberry da596182e1 Remove duplicate test for presence of boost header 2014-05-14 09:47:40 +10:00
Paul Davis 058986f77b finish unfinished work at basing all install paths on the program name 2014-04-28 21:11:08 -04:00
Paul Davis 2974c87684 parameterize install target directories based on --program-name configure option 2014-04-10 10:23:16 -04:00
Paul Davis 716c5b0642 new configure option for trx build, which also generates new menus file 2014-04-10 05:58:49 -04:00
Robin Gareus 543099afba rework SystemExec - use vfork wrapper (and lots of related stuff) 2014-03-13 16:58:07 +01:00
Paul Davis 495c0de4ac fix up waf build in wake of search path changes earlier today 2014-03-10 17:30:12 -04:00
Robin Gareus 1c839ed541 some more mingw x-compile fixes 2014-03-04 18:53:43 +01:00
Robin Gareus 912f07b919 mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64) 2014-03-04 15:25:58 +01:00
Robin Gareus 9952f774e9 some mingw related tweaks to the build-environment. 2014-03-03 16:09:14 +01:00
Robin Gareus 993ed56701 prepare standalone VST scanner tool.. part one 2014-02-25 14:57:57 +01:00
Paul Davis 6f759b5650 add headless to child list for wscript 2014-02-24 14:47:00 -05:00
Paul Davis 2a7ed69c28 merge with master, with minor conflict fixes 2014-02-07 19:00:44 -05:00
Paul Davis 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
Paul Davis c11bf0cc72 make -fvisibility=hidden be controlled by ./waf configure --exports-hidden 2014-01-31 10:25:58 -05:00
Paul Davis 0b9b895b8d current mingw actually calls libpthread libpthread 2014-01-31 10:25:58 -05:00
Paul Davis 0dee3813f9 reintroduce --lv2dir option and LV2DIR value to determine where to install builtin LV2 plugins 2014-01-18 18:21:33 -05:00
Paul Davis 83c0720645 remove VAMP and Rubberband from source tree 2014-01-12 15:40:48 -05:00
Paul Davis 0a2a6aaabb remove taglib from source tree (require external provision) 2014-01-12 15:40:48 -05:00
Paul Davis 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
Paul Davis 658bb3ccd4 finished merge of cairocanvas with windows and windows+cc branches 2014-01-10 17:11:10 -05:00
Paul Davis 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
Paul Davis 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
Paul Davis 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
Paul Davis 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
Paul Davis 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
Paul Davis 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
Paul Davis 08371ae2cf resolve merge with master (?) 2013-11-26 10:24:51 -05:00
Paul Davis fe6c5612a2 Merge branch 'master' into cairocanvas 2013-11-04 16:20:10 -05:00
Paul Davis e24089ec1f do not hard-code version number anymore - define via git or libs/ardour/revision.cc 2013-11-04 14:57:36 -05:00
Paul Davis ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
Paul Davis 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
Paul Davis d135c4dc3a fix merge conflicts with master 2013-10-23 08:47:57 -04:00
Paul Davis 664e715a00 merge from master 2013-10-22 15:29:44 -04:00
Paul Davis 61e66bb763 do not use --tags to get git description/version 2013-10-22 14:51:14 -04:00
Robin Gareus 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
Paul Davis e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
Paul Davis fb313fb174 Merge branch 'master' into windows 2013-10-16 21:57:17 -04:00
John Emmas 75b933eadb Merge remote-tracking branch 'remotes/origin/master' into windows+cc 2013-10-16 15:55:59 +01:00
Paul Davis cfd571f490 bump to 3.5 2013-10-15 13:30:15 -04:00
John Emmas fa71d82dda Merge branch 'windows' into windows+cc 2013-10-11 18:23:53 +01:00
Paul Davis 2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
Paul Davis af8a1c146d move JACK configuration test(s) down to where they belong (in libs/backend/jack) 2013-10-08 16:13:39 -04:00
John Emmas 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
Paul Davis 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
John Emmas 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
Paul Davis 7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
Paul Davis 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
Paul Davis bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
Paul Davis 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
Paul Davis 8c5cff6091 Merge branch 'master' into windows 2013-09-06 10:56:36 -04:00
Tim Mayberry 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
Paul Davis 91b027a4a0 bump to 3.4 2013-09-03 09:08:18 -04:00
Paul Davis 0013feddbf Merge branch 'master' into windows 2013-09-03 08:34:27 -04:00
Paul Davis dee91c2c39 Revert "bump to 3.4"
This reverts commit ad7ab8f09a.
2013-09-03 07:59:59 -04:00
Paul Davis 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
Paul Davis ad7ab8f09a bump to 3.4 2013-09-02 21:57:40 -04:00
Paul Davis ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
Robin Gareus 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
Paul Davis 3f423339bc add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs() 2013-08-08 15:26:18 -04:00
Paul Davis 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
Paul Davis d9862364be Add --single-tests option to also build each libardour test as a separate program 2013-08-08 15:23:08 -04:00
Robin Gareus 897074730a remove --no-freesound option. fixes #5640 2013-08-08 20:08:20 +02:00
Paul Davis bb8cb93789 Merge branch 'master' into windows 2013-08-01 10:44:58 -04:00
Paul Davis 0bd09a0e23 add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs() 2013-08-01 10:10:21 -04:00
Tim Mayberry 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
Tim Mayberry 56a6f52856 Remove lxvst variable from wscript that was no longer in use 2013-07-22 13:41:14 +10:00
Tim Mayberry 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
Tim Mayberry 1e9301a713 Define PLATFORM_WINDOWS and COMPILER_MINGW when dist target is set to mingw 2013-07-22 13:41:14 +10:00
Paul Davis 650964f320 Merge branch 'master' into windows 2013-07-17 08:05:59 -04:00
Paul Davis 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
Paul Davis 590e1fb458 Disable check for boost with mingw build 2013-07-15 13:43:47 -04:00
Paul Davis 00ae5492f4 (reapply with fixes) Build system changes to support mingw build target 2013-07-15 13:43:17 -04:00
Paul Davis 96ea407d1a Revert "Build system changes to support mingw build target"
This reverts commit 94145732f3.
2013-07-15 13:21:22 -04:00
Paul Davis 555174d510 Revert "tweaks to mingw build environment"
This reverts commit fa09121a7f.
2013-07-15 13:20:48 -04:00
Paul Davis fa09121a7f tweaks to mingw build environment 2013-07-15 13:17:32 -04:00
Paul Davis 94145732f3 Build system changes to support mingw build target 2013-07-15 13:16:09 -04:00
Paul Davis 7a5118f403 Add --single-tests option to also build each libardour test as a separate program 2013-07-11 10:57:21 -04:00
Paul Davis 3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
Paul Davis 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
Paul Davis f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
Paul Davis 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
Paul Davis a1e3cee926 bump to v3.2 2013-06-13 10:53:51 -04:00
Paul Davis 2e1e5da78e more changes to consolidate version definition into the top level wscript file 2013-06-11 11:37:52 -04:00
Paul Davis 31d234b48c Merge branch 'master' into cairocanvas 2013-06-07 13:18:48 -04:00
Robin Gareus 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
Paul Davis bebe2af95a merge with master 2013-05-08 14:48:28 -04:00
Paul Davis cadfc2aee1 various miscellany related to versions, gtk2 build and packaging 2013-05-08 13:16:50 -04:00
Paul Davis e8301185c0 a few minor changes required to get a DMG to build (on Tiger, at least) 2013-05-07 12:21:42 -04:00
Robin Gareus 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
Robin Gareus 66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Paul Davis bca507a808 Merge branch 'master' into cairocanvas 2013-04-09 14:23:41 -04:00
Paul Davis d79e3a21c6 bump to 3.1 2013-04-08 12:00:29 -04:00
Paul Davis 30968b8542 merge with master, including manual merge conflict resolution 2013-04-06 16:12:15 -04:00
Paul Davis 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
Paul Davis 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
Paul Davis aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Paul Davis 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
Robin Gareus 0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
Robin Gareus d957bf7a28 print the git version on build 2013-03-13 19:13:00 +01:00
Robin Gareus 59c74e675c git revision extraction 2013-03-12 17:44:48 +01:00
Paul Davis 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
Paul Davis 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
Paul Davis 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