smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-14 10:36:34 +01:00
Code Issues Projects Releases Wiki Activity

* applied patch for ardour-3.0 to compile on OS X thanks to Sakari Bergen

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3338 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2008-05-12 11:46:53 +00:00
parent 277bfa35d5
commit 636f2184a5
8 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -596,6 +596,9 @@ libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
libraries['pango'] = LibraryInfo() libraries['pango'] = LibraryInfo()
libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango') libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango')
libraries['pangocairo'] = LibraryInfo()
libraries['pangocairo'].ParseConfig ('pkg-config --cflags --libs pangocairo')
libraries['libgnomecanvas2'] = LibraryInfo() libraries['libgnomecanvas2'] = LibraryInfo()
libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0') libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0')

2
gtk2_ardour/SConscript
View file

@ -25,7 +25,7 @@ gtkardour.Append(PACKAGE=domain)
gtkardour.Append(POTFILE=domain + '.pot') gtkardour.Append(POTFILE=domain + '.pot')
if gtkardour['IS_OSX']: if gtkardour['IS_OSX']:
gtkardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048") gtkardour.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048 -framework CoreAudio")
gtkardour.Merge ([ gtkardour.Merge ([
libraries['ardour'], libraries['ardour'],

6
gtk2_ardour/main.cc
View file

@ -216,9 +216,9 @@ fixup_bundle_environment ()
pangorc << "[Pango]\nModuleFiles="; pangorc << "[Pango]\nModuleFiles=";
pangopath = dir_path; pangopath = dir_path;
pangopath /= '..'; pangopath /= "..";
pangopath /= 'Resources'; pangopath /= "Resources";
pangopath /= 'pango.modules'; pangopath /= "pango.modules";
pangorc << pangopath.to_string() << endl; pangorc << pangopath.to_string() << endl;
pangorc.close (); pangorc.close ();

4
libs/cairomm/cairomm/Makefile.am
View file

@ -3,9 +3,9 @@ SUBDIRS =
INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@
h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h
h_sources_private = private.h h_sources_private = private.h context_private.h
cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc
cc_sources_private = private.cc cc_sources_private = private.cc context_surface_quartz.cc context_surface_win32.cc context_surface_xlib.cc
# Support for DLL on cygwin/mingw using libtool > 1.4 # Support for DLL on cygwin/mingw using libtool > 1.4
if PLATFORM_WIN32 if PLATFORM_WIN32

12
libs/cairomm/cairomm/context.cc
View file

@ -17,11 +17,9 @@
*/ */
#include <cairomm/context.h> #include <cairomm/context.h>
#include <cairomm/context_private.h>
#include <cairomm/private.h> #include <cairomm/private.h>
#include <cairomm/surface.h> #include <cairomm/surface.h>
#include <cairomm/win32_surface.h>
#include <cairomm/xlib_surface.h>
#include <cairomm/quartz_surface.h>
/* M_PI is defined in math.h in the case of Microsoft Visual C++ */ /* M_PI is defined in math.h in the case of Microsoft Visual C++ */
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -29,6 +27,8 @@
#include <math.h> #include <math.h>
#endif #endif
using namespace Cairo::Private;
namespace Cairo namespace Cairo
{ {
@ -674,7 +674,7 @@ RefPtr<Surface> get_surface_wrapper (cairo_surface_t* surface)
#endif #endif
#if CAIRO_HAS_XLIB_SURFACE #if CAIRO_HAS_XLIB_SURFACE
case CAIRO_SURFACE_TYPE_XLIB: case CAIRO_SURFACE_TYPE_XLIB:
return RefPtr<XlibSurface>(new XlibSurface(surface, false /* does not have reference */)); return wrap_surface_xlib(surface);
break; break;
#endif #endif
#if CAIRO_HAS_GLITZ_SURFACE #if CAIRO_HAS_GLITZ_SURFACE
@ -684,12 +684,12 @@ RefPtr<Surface> get_surface_wrapper (cairo_surface_t* surface)
#endif #endif
#if CAIRO_HAS_QUARTZ_SURFACE #if CAIRO_HAS_QUARTZ_SURFACE
case CAIRO_SURFACE_TYPE_QUARTZ: case CAIRO_SURFACE_TYPE_QUARTZ:
return RefPtr<QuartzSurface>(new QuartzSurface(surface, false /* does not have reference */)); return wrap_surface_quartz(surface);
break; break;
#endif #endif
#if CAIRO_HAS_WIN32_SURFACE #if CAIRO_HAS_WIN32_SURFACE
case CAIRO_SURFACE_TYPE_WIN32: case CAIRO_SURFACE_TYPE_WIN32:
return RefPtr<Win32Surface>(new Win32Surface(surface, false /* does not have reference */)); return wrap_surface_win32(surface);
break; break;
#endif #endif
#if CAIRO_HAS_SVG_SURFACE #if CAIRO_HAS_SVG_SURFACE

4
libs/cairomm/cairomm/context.h
View file

@ -967,6 +967,10 @@ protected:
cobject* m_cobject; cobject* m_cobject;
}; };
RefPtr<Surface> get_surface_quartz(cairo_surface_t*);
RefPtr<Surface> get_surface_win32(cairo_surface_t*);
RefPtr<Surface> get_surface_xlib(cairo_surface_t*);
} // namespace Cairo } // namespace Cairo
#endif //__CAIROMM_CONTEXT_H #endif //__CAIROMM_CONTEXT_H

4
libs/glibmm2/SConscript
View file

@ -10,7 +10,9 @@ glibmm2_files = glob.glob('glib/glibmm/*.cc')
Import('env libraries install_prefix') Import('env libraries install_prefix')
glibmm2 = env.Copy() glibmm2 = env.Copy()
glibmm2.Merge([libraries['sigc2'], libraries['glib2'], libraries['glibmm2']]) glibmm2.Merge([libraries['sigc2'], libraries['glib2']])
glibmm2.Append(LIBPATH='#libs/glibmm2',
CPPPATH='#libs/glibmm2/glib')
glibmm2.Append(CXXFLAGS=['-DHAVE_CONFIG_H', '-DGLIBMM_EXCEPTIONS_ENABLED', '-DGLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED', '-DGLIBMM_PROPERTIES_ENABLED']) glibmm2.Append(CXXFLAGS=['-DHAVE_CONFIG_H', '-DGLIBMM_EXCEPTIONS_ENABLED', '-DGLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED', '-DGLIBMM_PROPERTIES_ENABLED'])
#glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED') #glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED')

2
libs/gtkmm2/pango/SConscript
View file

@ -8,7 +8,7 @@ pangomm_files = glob.glob('pangomm/*.cc')
Import('env libraries install_prefix') Import('env libraries install_prefix')
pangomm = env.Copy() pangomm = env.Copy()
pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2'], libraries['cairomm'], libraries['cairo']]) pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2'], libraries['cairomm'], libraries['cairo'], libraries['pangocairo'] ])
if pangomm['IS_OSX']: if pangomm['IS_OSX']:
pangomm.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048") pangomm.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")