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
parent d15fda6d75 897fbdc652
commit 3020b224fa
466 changed files with 10821 additions and 1674 deletions
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -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: