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
8ddd12a60d
Rename SearchPath class Searchpath
...
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
060c56cc3f
Minor tweaks to MSVC build (hopefully of little consequence)
2013-08-26 17:50:17 +01:00
ee1b49f87e
fix merge conflicts from master
2013-08-24 12:18:06 -04:00
04bf9d1e95
fix newly-appearing crash-at-close caused by muddled thinking in pbd/pthread_utils
...
threads created with this code can now just return a value as they normally would, and the
infrastructure will ensure cleanup. there is no longer any reason to call pthread_exit_pbd()
and so that has been removed.
2013-08-15 11:44:47 -04:00
e6521bb043
Merge branch 'master' into cairocanvas
2013-08-14 13:11:34 -04:00
63745512bc
Call setup_libpbd_enums in PBD::init for portability
2013-08-13 20:15:47 +10:00
1db894f886
Call Gio::init from PBD::init instead of ARDOUR::init
...
PBD needs Gio for PBD::copy_file and perhaps others
2013-08-13 20:15:47 +10:00
29193c76cc
Add PBD::init and PBD::cleanup
...
A bit of refactoring to move initialization of libpbd into libpbd
rather than rely on "client" code(ui,libardour,tests etc) to do it
2013-08-13 20:15:47 +10:00
Michael Fisher
71e2fbbcff
Resolve duplicate symbol 'cocoa_open_uri' on OSX builds.
...
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
2013-08-08 15:26:19 -04:00
Michael Fisher
9afb71eb5a
Stop compiler warning about NSURL
2013-08-08 15:26:18 -04:00
Michael Fisher
bfbc55a673
Proper OSX/CLANG/CXX11 support in stl_delete.h
...
- replaces fix in 066df0d218
2013-08-08 15:26:17 -04:00
59a3b797d7
fix compiler warnings.
2013-08-08 15:26:16 -04:00
Michael R. Fisher
ea08feec48
Temporary OSX/Clang/C++11 workaround
...
- Adds a directive that includes <vector> upon specific conditions
- WIP
2013-08-08 15:23:10 -04:00
daad42dd6c
Revert "Remove non-portable and unnused header includes"
...
This reverts commit 7ef79d3f4b
2013-08-08 15:23:08 -04:00
cebd189239
Remove non-portable and unnused header includes
2013-08-08 15:23:08 -04:00
8c28b3ad07
add new files from test changes by timbyr
2013-08-08 15:23:08 -04:00
20311ed2f3
Use test_search_path to find test data in xpath test
2013-08-08 15:23:08 -04:00
cdaa32d2c6
Add test_search_path function in PBD testsuite
2013-08-08 15:23:08 -04:00
490311bc08
'libs/ardour' - Main body of changes required for building with MSVC
2013-08-04 15:36:07 +01:00
fa59391f6a
'libs/ardour' - Use 'const_iterator' where appropriate (required to be buildable with MSVC)
2013-08-04 15:06:10 +01:00
aaabaf5d3c
Merge branch 'master' into windows
2013-08-02 12:51:24 -04:00
Michael Fisher
71c26e2820
Resolve duplicate symbol 'cocoa_open_uri' on OSX builds.
...
cocoa_open_uri.mm was being added to the source list
twice and also compiling twice. This patch enusres it is
only added once.
2013-08-02 12:01:47 -04:00
Michael Fisher
d882b03f7d
Stop compiler warning about NSURL
2013-08-02 08:59:32 -05:00
6a436fd826
fix merge conflict from master
2013-07-31 20:11:15 -04:00
98c6ca5abc
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
2013-07-31 15:09:50 +01:00
Michael Fisher
a8456b3766
Proper OSX/CLANG/CXX11 support in stl_delete.h
...
- replaces fix in 066df0d218
2013-07-29 14:43:11 -05:00
cd28d62b26
fix compiler warnings.
2013-07-28 20:32:52 +02:00
338f53e69a
Further changes to msvc/pbd (mostly to add support for getopt and getopt_long)
2013-07-24 17:46:25 +01:00
7f882b5a92
Correct a typo in 'msvc_pbd.h'
2013-07-24 10:22:16 +01:00
b02fb1dbea
Reinstate include of regex.h for Linux and MinGW build
...
I'm not sure how boost/regex.h is relevant but it doesn't enable the
build to succeed in on Linux or using Mingw so if this is not an error
and required for msvc build then fix it
2013-07-22 13:42:05 +10:00
9d774969fc
Adapt libs/pbd/ffs.cc to be buildable with MSVC
2013-07-18 12:08:34 +01:00
57e53d577b
break symbol name cycle on non-win32-non-gcc platforms
2013-07-17 13:50:04 -04:00
5f15bc9f9f
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
2013-07-17 18:15:51 +01:00
110972e59a
JOHNE source files (needed for building libpbd with MSVC)
2013-07-17 14:53:17 +01:00
650964f320
Merge branch 'master' into windows
2013-07-17 08:05:59 -04:00
5f2fcb2e32
Add PBD::ffs function
2013-07-17 19:29:34 +10:00
11335e4bf0
Allow PBD::canonical_path to compile with mingw build
2013-07-17 19:07:23 +10:00
57f9a4c344
Merge branch 'windows' of git://git.ardour.org/ardour/ardour into windows
2013-07-17 08:24:36 +01:00
350ed31655
Remaining changes needed for building libpdb on Windows (except for adding the extra JE source modules)
2013-07-17 08:08:46 +01:00
105652ad09
Accommodate 'pthread-win32' and 'boost/regex' (for libpbd)
2013-07-17 08:06:26 +01:00
c7306f5732
Other (Windows specific) includes for libpbd
2013-07-17 07:38:20 +01:00
e257b79ecd
'libs/pbd/file_utils.cc' didn't apply cleanly for some reason
2013-07-16 19:13:18 +01:00
7b480eaa27
Windows (compiler specific) includes for libpbd
2013-07-16 18:00:49 +01:00
Michael R. Fisher
066df0d218
Temporary OSX/Clang/C++11 workaround
...
- Adds a directive that includes <vector> upon specific conditions
- WIP
2013-07-15 22:57:35 -05:00
15be154515
use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files
2013-07-15 14:29:00 -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
94145732f3
Build system changes to support mingw build target
2013-07-15 13:16:09 -04:00
