diff options
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | SConstruct | 35 | ||||
-rw-r--r-- | libs/clearlooks-newer/SConscript | 10 | ||||
-rwxr-xr-x | tools/osx_packaging/osx_build | 2 |
4 files changed, 26 insertions, 25 deletions
@@ -1,5 +1,3 @@ -Please see the DOCUMENTATION directory. - -If you plan to compile ardour from scratch, BUILD is required reading. +Please see the Ardour web site at http://ardour.org/ for all documentation. diff --git a/SConstruct b/SConstruct index 6e54676390..5933c5d761 100644 --- a/SConstruct +++ b/SConstruct @@ -843,15 +843,15 @@ if env['LIBLO']: def prep_libcheck(topenv, libinfo): if topenv['IS_OSX']: # - # 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 + # rationale: GTK-Quartz uses jhbuild and installs to ~/gtk/inst by default. + # All libraries needed should be built against this location if topenv['GTKOSX']: - 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") + GTKROOT = os.path.expanduser ('~/gtk/inst') + libinfo.Append(CPPPATH= GTKROOT + "/include", LIBPATH= GTKROOT + "/lib") + libinfo.Append(CXXFLAGS="-I" + GTKROOT + "/include", LINKFLAGS="-L" + GTKROOT + "/lib") + + + prep_libcheck(env, env) @@ -1041,6 +1041,11 @@ else: env = conf.Finish() +if env['GTKOSX']: + clearlooks_version = 'libs/clearlooks-newer' +else: + clearlooks_version = 'libs/clearlooks-older' + if env['SYSLIBS']: syslibdeps = \ @@ -1126,7 +1131,7 @@ if env['SYSLIBS']: # 'libs/flowcanvas', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks' + clearlooks_version ] else: @@ -1201,7 +1206,7 @@ else: 'libs/libgnomecanvasmm', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks' + clearlooks_version ] # @@ -1394,12 +1399,10 @@ env.Distribute (env['DISTTREE'], 'icons/icon/ardour_icon_tango_48px_blue.png', 'icons/icon/ardour_icon_tango_48px_red.png' ] + - glob.glob ('DOCUMENTATION/AUTHORS*') + - glob.glob ('DOCUMENTATION/CONTRIBUTORS*') + - glob.glob ('DOCUMENTATION/TRANSLATORS*') + - glob.glob ('DOCUMENTATION/BUILD*') + - glob.glob ('DOCUMENTATION/FAQ*') + - glob.glob ('DOCUMENTATION/README*') + glob.glob ('ardour.1*') + + glob.glob ('libs/clearlooks-newer/*.c') + + glob.glob ('libs/clearlooks-newer/*.h') + + glob.glob ('libs/clearlooks-newer/SConscript') ) srcdist = env.Tarball(env['TARBALL'], [ env['DISTTREE'], the_revision ]) diff --git a/libs/clearlooks-newer/SConscript b/libs/clearlooks-newer/SConscript index 46cd9d04c5..9b58562178 100644 --- a/libs/clearlooks-newer/SConscript +++ b/libs/clearlooks-newer/SConscript @@ -6,7 +6,7 @@ import glob libclearlooks_files = [ 'animation.c', 'cairo-support.c', - 'clearlooks_draw.c', + 'clearlooks_draw.c', 'clearlooks_draw_glossy.c', 'clearlooks_draw_gummy.c', 'clearlooks_draw_inverted.c', @@ -28,13 +28,13 @@ if env['GTKOSX']: clearlooks.Append (CCFLAGS = '-DGTKOSX') libclearlooks = clearlooks.SharedLibrary('clearlooks', libclearlooks_files) - usable_libclearlooks = clearlooks.Install ('engines', libclearlooks) + Default (usable_libclearlooks) -env.Alias('install', - env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'), - libclearlooks)) +env.Alias('install', env.Install ( + os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'), + libclearlooks)) env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', 'bits.c'] + diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 6707902d34..eed65c764b 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -204,7 +204,7 @@ rm pangorc sed "s?$GTKQUARTZ_ROOT/lib/gtk-2.0/2.10.0/loaders/?@executable_path/../Frameworks/modules/?" < $GTKQUARTZ_ROOT/etc/gtk-2.0/gdk-pixbuf.loaders > $Resources/gdk-pixbuf.loaders # this one is special - we will set GTK_PATH to $Frameworks/clearlooks -cp ../../libs/clearlooks/libclearlooks.dylib $Frameworks +cp ../../libs/clearlooks-newer/libclearlooks.dylib $Frameworks mkdir -p $Frameworks/clearlooks/engines (cd $Frameworks/clearlooks/engines && ln -s ../../libclearlooks.dylib libclearlooks.dylib && ln -s ../../libclearlooks.dylib libclearlooks.so) |