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
