allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

Browse Source
This commit is contained in:
Paul Davis
2014-01-10 16:07:57 -05:00
parent d15fda6d75 897fbdc652
commit 3020b224fa
466 changed files with 10821 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/surfaces/control_protocol/control_protocol/control_protocol.h
View File

@@ -145,7 +145,7 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope
void prev_track (uint32_t initial_id);
private:
ControlProtocol (const ControlProtocol&); /* noncopyable */
LIBCONTROLCP_LOCAL ControlProtocol (const ControlProtocol&); /* noncopyable */
bool _active;
};

2
libs/surfaces/control_protocol/wscript
View File

@@ -28,7 +28,7 @@ def build(bld):
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=controlcp_sources)
# defines for this library
obj.defines = [ 'LIBCONTROLCP_DLL_EXPORTS=1' ]
obj.defines = [ 'LIBCONTROLCP_DLL_EXPORTS' ]
obj.cxxflags = [ '-fvisibility=hidden' ]
obj.cflags = [ '-fvisibility=hidden' ]
else: