diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-09 02:42:40 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-09 02:42:40 +0000 |
| commit | 070ca5043c7e961d7a22510125f4036e4d0b8e4b (patch) | |
| tree | 7d91a3f4153c60383007d3f78e2df084b4035826 /SConstruct | |
| parent | 9e9c7a85365a924e207f72c6682a45de04ee95b9 (diff) | |
new keybinding editor, mostly finished but not 100%
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2531 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 159c064ac2..c84d0aa754 100644 --- a/SConstruct +++ b/SConstruct @@ -715,8 +715,8 @@ 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 if topenv['GTKOSX']: - libinfo.Append(CCFLAGS="-I/opt/gtk/include", LINKFLAGS="-L/opt/gtk/lib") - libinfo.Append(CCFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib") + libinfo.Append(CPPPATH="/opt/gtk/include", LIBPATH="/opt/gtk/lib") + libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib") prep_libcheck(env, env) @@ -745,7 +745,7 @@ libraries['usb'] = conf.Finish () libraries['flac'] = LibraryInfo () prep_libcheck(env, libraries['flac']) -libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") +libraries['flac'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib") # # june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions @@ -769,7 +769,7 @@ libraries['flac'] = conf.Finish () libraries['boost'] = LibraryInfo () prep_libcheck(env, libraries['boost']) -libraries['boost'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") +libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib") conf = Configure (libraries['boost']) if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False: print "Boost header files do not appear to be installed." |