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
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
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
cfd571f490
bump to 3.5
2013-10-15 13:30:15 -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
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
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
Nils Philippsen
e3b954e16f
don't confuse arm with i686
2013-09-13 16:28:04 +02: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
91b027a4a0
bump to 3.4
2013-09-03 09:08:18 -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
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
0bd09a0e23
add _ISOC9X_SOURCE define to compiler command line to provide uniform access to llabs()
2013-08-01 10:10:21 -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
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
