Commit graph

370 commits

Author SHA1 Message Date
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