13
0
Commit Graph

414 Commits

Author SHA1 Message Date
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
a9bb9f0401 welcome to version 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0@14206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-10 15:33:21 +00:00
ba73a77c63 switch to Lucida Sans Typewriter as OS X monospace font; new pingback code to get announcements from ardour.org (can be disabled on the command line with -a)
git-svn-id: svn://localhost/ardour2/branches/3.0@14189 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 16:41:45 +00:00
7dab0f7e04 get 1040 vs 1070 OS X min requirement working (for lion, at least)
git-svn-id: svn://localhost/ardour2/branches/3.0@14185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 04:28:18 +00:00
e301c7ca61 include min OS X spec in CXXFLAGS as well as CFLAGS
git-svn-id: svn://localhost/ardour2/branches/3.0@14184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 04:11:54 +00:00
2d1cb16c4c correct python syntax
git-svn-id: svn://localhost/ardour2/branches/3.0@14180 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 03:41:02 +00:00
5907f3eb03 potential fix, part two, for Tiger-based font issues. this also switches things so that building on Lion or Mountain Lion sets MAC_OS_VERSION_MIN_REQUIRED to 1070, to avoid legacy stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@14179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 03:39:58 +00:00
95c86bec2d two fixes from TheCranston to help out on OS X with disk space measurement, modified by me
git-svn-id: svn://localhost/ardour2/branches/3.0@14157 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-06 01:05:15 +00:00
f9d908e3a9 allow build/packaging scripts to find the right version ID for as long as we have separate designations on different platforms
git-svn-id: svn://localhost/ardour2/branches/3.0@14132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 15:49:36 +00:00
968c53aba1 bump version to rc3, but keep OS X releases as "beta"
git-svn-id: svn://localhost/ardour2/branches/3.0@14128 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 14:58:20 +00:00
126802ffc5 add --depstack-root option to waf to allow building with gtk/ardour dependency stacks in various locations; clean up libintl logic in wscript
git-svn-id: svn://localhost/ardour2/branches/3.0@14099 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-26 14:29:58 +00:00
a4fb605804 reinstate decode() call on Popen.communicate() output, needed for python 3
git-svn-id: svn://localhost/ardour2/branches/3.0@14069 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-20 21:48:17 +00:00
ff0662ef85 revert 14046 which attempted to "fix" something with python3 but broke various common uses
git-svn-id: svn://localhost/ardour2/branches/3.0@14068 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-20 20:13:35 +00:00
9bbed5925d add MIDNAM (patchfiles) to child list so that they get installed
git-svn-id: svn://localhost/ardour2/branches/3.0@14057 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-13 19:38:47 +00:00
Sakari Bergen
6dbfeaf164 Make fetch_svn_revision work properly with python 3
git-svn-id: svn://localhost/ardour2/branches/3.0@14046 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-03 13:21:52 +00:00
9d29fb8e0a reverse logic used to decide whether or not to explicitly link against libintl, which should not happen on a linux system where glibc includes the libintl API
git-svn-id: svn://localhost/ardour2/branches/3.0@13973 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-23 01:47:18 +00:00
daf22cd327 fix git-svn version extraction for local git branches
git-svn-id: svn://localhost/ardour2/branches/3.0@13962 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 22:41:31 +00:00
ee71553180 new take on getting SVN revision number
git-svn-id: svn://localhost/ardour2/branches/3.0@13881 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 01:11:48 +00:00
a52deb13e7 fix i18n-caused error in determining svn revision (shoudl fix #5256)
git-svn-id: svn://localhost/ardour2/branches/3.0@13798 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 19:14:46 +00:00
33d071468f fix error in wscript re: wiimote
git-svn-id: svn://localhost/ardour2/branches/3.0@13797 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 18:55:33 +00:00
0209267980 reinstate wiimote support, thanks to work by jannis pohlmann
git-svn-id: svn://localhost/ardour2/branches/3.0@13796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-07 18:28:09 +00:00
982f9beaab sys.platform == 'linux2' VA linux2.x and 3.x
git-svn-id: svn://localhost/ardour2/branches/3.0@13792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-06 09:49:49 +00:00
1ba50c59d1 !darwin != linux
needed for BSD support.
tools/sanity_check is Linux specific.

git-svn-id: svn://localhost/ardour2/branches/3.0@13780 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 10:08:04 +00:00
1f6684237c fix builds on newer gcc/ld
git-svn-id: svn://localhost/ardour2/branches/3.0@13778 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 21:46:29 +00:00
c9c94ca1c2 merge robin gareus' libltc into ardour source tree for convenience
git-svn-id: svn://localhost/ardour2/branches/3.0@13665 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-14 16:18:47 +00:00
932615d7a6 bump version
git-svn-id: svn://localhost/ardour2/branches/3.0@13599 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-04 22:31:15 +00:00
5446fc3339 (re)fix for OS X 10.6 math.h breakage
git-svn-id: svn://localhost/ardour2/branches/3.0@13598 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-04 20:19:23 +00:00
27fdf5f6e3 fix for OS X 10.6 math.h breakage
git-svn-id: svn://localhost/ardour2/branches/3.0@13597 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-04 20:18:50 +00:00
aad35ec182 clean up stupid confusion over ardour_system.rc and its contents. this file does not require substitution anymore, and besides, it was being subst'ed incorrectly because of changes to waf that were addressed in gtk2_ardour/wscript but not the top level wscript
git-svn-id: svn://localhost/ardour2/branches/3.0@13408 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 13:27:14 +00:00
Carl Hetherington
1a9d9b058c Fix wscript when PKG_CONFIG_PATH is empty.
git-svn-id: svn://localhost/ardour2/branches/3.0@13210 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-05 08:53:18 +00:00
5ee968d66b fix up various aspects of building against a private/personal dependency stack
git-svn-id: svn://localhost/ardour2/branches/3.0@13209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-04 22:21:59 +00:00
760ccbabfb add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-10 15:57:09 +00:00
3b566446b2 fix for fetching git revision, from robin gareus
git-svn-id: svn://localhost/ardour2/branches/3.0@13085 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-26 12:31:42 +00:00
eb6e352dd0 we're not really a beta anymore
git-svn-id: svn://localhost/ardour2/branches/3.0@13083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 17:45:09 +00:00
ce17c5727c add a new -DBOOST_SYSTEM_NO_DEPRECATED to try to remove the need to link against boost::system on boost 1.50 and above
git-svn-id: svn://localhost/ardour2/branches/3.0@13081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 11:16:19 +00:00
02fad6c375 bump glibmm required version to 2.32
git-svn-id: svn://localhost/ardour2/branches/3.0@13080 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-25 10:56:33 +00:00
1cdf02ae2f remove use of boost::thread/boost::mutex; bump glibmm requirement to 2.30 in order to pick up Glib::Threads::Mutex which can be used statically, use that to replace boost::mutex; add required inclusion of <cerrno> in a couple of places
git-svn-id: svn://localhost/ardour2/branches/3.0@13076 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-24 21:43:05 +00:00
23aa71c759 bump version
git-svn-id: svn://localhost/ardour2/branches/3.0@13067 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-23 13:32:01 +00:00
Carl Hetherington
366b7ac36b Try to make cppunit mandatory if --test is passed to
configure.


git-svn-id: svn://localhost/ardour2/branches/3.0@12653 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-11 13:07:10 +00:00
27a1cf2cf7 Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:

CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build


git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:54:10 +00:00
f86f363243 bump version because of paste deadlock
git-svn-id: svn://localhost/ardour2/branches/3.0@12404 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-23 21:12:34 +00:00
528abdeaa4 bump to beta4
git-svn-id: svn://localhost/ardour2/branches/3.0@12381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-22 13:08:05 +00:00
d52012f398 remove Tranzport configure option, since the code will not work
git-svn-id: svn://localhost/ardour2/branches/3.0@12353 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-21 09:30:00 +00:00
813c5f0af9 major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)

git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-18 17:24:06 +00:00
cb617bb1c7 some tweaks to wscript, primary goal to make libintl stuff discoverable even on the linux build VMs where its not part of glibc
git-svn-id: svn://localhost/ardour2/branches/3.0@12320 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-17 11:20:40 +00:00
8647471379 Fix posix_memalign checks.
git-svn-id: svn://localhost/ardour2/branches/3.0@12316 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-17 00:54:43 +00:00
1fdd45a1ad fixup generic build, which allows -arch i386 build on OS X, effectively cross-compiling a 32 bit build on an x86_64 system
git-svn-id: svn://localhost/ardour2/branches/3.0@12307 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 08:41:40 +00:00
fc334a06b5 fix dangling remnant of old system config var
git-svn-id: svn://localhost/ardour2/branches/3.0@12291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-15 13:00:38 +00:00
4476ecec6b add --generic flag to wscript to trigger -mtune=generic builds; stop using old GNU config.guess script and use python's builtin os.uname() values
git-svn-id: svn://localhost/ardour2/branches/3.0@12290 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-15 12:55:23 +00:00
966efcc476 fix python3 incompatability in wscript
git-svn-id: svn://localhost/ardour2/branches/3.0@12286 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-15 11:09:03 +00:00
Carl Hetherington
14a86aaccc Merge old a new signals code into one set of classes.
git-svn-id: svn://localhost/ardour2/branches/3.0@12278 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-15 00:05:57 +00:00
b544f9c2db disable installing a3 for now, so that people don't scratch their heads when it doesn't work
git-svn-id: svn://localhost/ardour2/branches/3.0@12251 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 13:01:59 +00:00
8a4ad6480c use pkg-config to find curl and assume that version 7.X has curl_global_init
git-svn-id: svn://localhost/ardour2/branches/3.0@12181 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 12:59:05 +00:00
76e83768dc potential fix for ./waf configure problems introduced last night
git-svn-id: svn://localhost/ardour2/branches/3.0@12180 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 12:29:43 +00:00
24f286b8e4 try to use --also-libdir to try to find curl, part 3
git-svn-id: svn://localhost/ardour2/branches/3.0@12173 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 02:49:12 +00:00
ab642b9895 try to use --also-libdir to try to find curl, part 2
git-svn-id: svn://localhost/ardour2/branches/3.0@12172 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 02:48:00 +00:00
56129b4b72 try to use --also-libdir to try to find curl
git-svn-id: svn://localhost/ardour2/branches/3.0@12171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 02:46:42 +00:00