658bb3ccd4
finished merge of cairocanvas with windows and windows+cc branches
2014-01-10 17:11:10 -05:00
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
dfec88e1a3
add proper namespace to PBD::demangle for systems without execinfo
2013-12-29 13:59:37 -05:00
b0e4f81eb3
merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.
...
Still need to add API export/visibility macros for the canvas library.
2013-12-27 14:29:06 -05:00
b1231696ca
Mingw64 has pthread_t available, and does not need a thread ID comparison function
2013-12-19 13:04:04 -05:00
dc60753dde
Use correct header include for _fullpath
...
According to http://msdn.microsoft.com/en-us/library/506720ff(v=vs.120).aspx
2013-12-07 20:48:02 +10:00
a7961f04cf
fix error in mingw version of realpath()
2013-12-05 17:43:15 -05:00
ef2c1ff92f
add (likely, partial) windows implementation of POSIX realpath() for COMPILER_MINGW where the latter is not available, to the only place realpath() is used
2013-12-05 17:40:21 -05:00
e0cc10540d
extra source no longer required
2013-12-05 17:24:39 -05:00
bab60c2e8c
we don't use realpath() anymore so there is need for a special mingw include
2013-12-05 17:23:18 -05:00
c0e5506994
we don't use realpath() anymore so there is need for a special mingw include
2013-12-05 17:21:50 -05:00
8970446d7e
additional source file for mingw build
2013-12-05 14:48:45 -05:00
597c9c9b25
make mingw-based pthread comparison function work with both 32 and 64 bit variants of mingw
2013-12-05 14:46:40 -05:00
b7835cd7b1
workaround compilation issues with assembler in fpu code and mingw
2013-12-05 14:45:17 -05:00
3a885d6177
Only use __declspec(dllimport/dllexport) for MSVC compiler
...
Use the gcc visibility attributes when building with the MinGW compiler(gcc).
GCC also supports the __declspec syntax but it will not compile at the moment
until the issues(which may not even be exactly the same issues as with MSVC)
are resolved.
2013-12-05 21:11:18 +10:00
6bd36896e7
'libs/pbd' - DLL visibility stuff and associated changes needed for building with MSVC. Currently includes debugging information and things that are just commented out until we have known compatibility with the other platforms (i.e. contains stuff to be removed at a later date)
2013-12-01 14:26:08 +00:00
0cca272431
try to fix various warnings from gcc when optimization flags are enabled
2013-11-04 21:32:41 -05:00
f85c67501c
reverse the visibility.h files assumptions that we don't build shared libs by default
...
This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.
Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.
2013-10-18 11:50:44 -04:00
b855e5f322
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
2fab8182cc
add -fvisibility=hidden to libgtkmm2ext, and make things work
2013-10-17 14:36:41 -04:00
2eabeebdc5
add -fvisibility=hidden to libpbd, and make things work
2013-10-17 13:51:02 -04:00
f3d2ca0d9a
get everything compiling with libardour built using -fvisibility=hidden
2013-10-17 12:41:28 -04:00
24d2b5ec92
add export visibility macros across libardour
2013-10-17 10:02:11 -04:00
c5115c9a3c
add export visibility control to libpbd (works thus far on linux/gcc)
2013-10-16 23:30:28 -04:00
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
97c68cc2b1
Merge branch 'windows' into windows+cc
...
Conflicts (hopefully resolved):
libs/pbd/stacktrace.cc
2013-10-15 17:38:08 +01:00
69a8fc43e2
Merge branch 'master' into windows
2013-10-15 11:17:12 -04:00
8a76441b0f
re-fix typo in PBD::demangle() for systems without execinfo.h
2013-10-15 10:52:29 -04:00
a29b83c124
fix namespace issue with demangle on systems without execinfo.h
2013-10-15 10:41:42 -04:00
89738cc3c2
fix typo in PBD::demangle() for systems without execinfo.h
2013-10-15 10:33:03 -04:00
e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
4fac237fdc
'PBD::demangle()' - Minor modification to keep MSVC happy
2013-10-14 17:40:15 +01:00
b5f36f5788
fix up parsing of send gain MIDI bindings so that they actually work
2013-10-10 16:16:59 -04:00
2a6a16f980
merge with master, fixing conflicts in 3 wscript files
2013-10-09 14:00:42 -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
3aee160b19
provide PBD::demangle() even on platforms without HAVE_EXECINFO
2013-10-04 12:22:00 -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
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
