diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-09-03 18:15:31 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-09-03 18:15:31 +0000 |
| commit | e11544b59aaf84e2d4ed1a6fb57e1ae5e6e05ebf (patch) | |
| tree | 9a6d8fc657d5f187113e3342924f5080bc48c3c4 /SConstruct | |
| parent | 860125cb532e0987692e317ca8f4d08a0b76dda0 (diff) | |
Unify the canvases by moving groups around rather than using set_scrolling_region () (eliminates the double-draw during zoom on linux), fix verbose_time_cursor clamping, make fonts smaller on location dialog buttons, hopefully improve performance when dragging multiple regions on the same track, reduce some redrawing of clocks (still not done for samples clock), allow NLS=1 on OSX, other canvas performance improvements on OSX, build SAE-us.bindings (even though they are incomplete for now).
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3707 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 9ff6a61e11..88ffd6993a 100644 --- a/SConstruct +++ b/SConstruct @@ -838,12 +838,13 @@ def prep_libcheck(topenv, libinfo): # # rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default. # All libraries needed should be built against this location + # However.. now jhbuild installs to ~/gtk/inst by default.. changed to accomodate this if topenv['GTKOSX']: - gtkroot = os.path.expanduser ("~"); - libinfo.Append(CPPPATH="$GTKROOT/include", LIBPATH="$GTKROOT/lib") - libinfo.Append(CXXFLAGS="-I$GTKROOT/include", LINKFLAGS="-L$GTKROOT/lib") - libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib") - libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib") + GTKROOT = os.path.expanduser ('~/gtk/inst') + libinfo.Append(CPPPATH= GTKROOT + "/include", LIBPATH= GTKROOT + "/lib") + libinfo.Append(CXXFLAGS="-I" + GTKROOT + "/include", LINKFLAGS="-L" + GTKROOT + "/lib") + #libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib") + #libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib") prep_libcheck(env, env) |