smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-26 08:27:43 +01:00
Code Issues Projects Releases Wiki Activity

no more NATIVE_OSX_KEYS option - GTKOSX selects for that too

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3581 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-07-10 14:55:15 +00:00
parent da41e49022
commit f2a604f820
2 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
SConstruct
View file

@ -5,6 +5,7 @@
#
import os
import os.path
import sys
import re
import shutil
@ -35,7 +36,6 @@ opts.AddOptions(
BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0),
BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0),
BoolOption('OLDFONTS', 'Old school font sizes', 0),
BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
BoolOption('STL_DEBUG', 'Set to build with Standard Template Library Debugging', 0),
@ -529,6 +529,9 @@ if conf.CheckPKGExists ('fftw3'):
if conf.CheckPKGExists ('aubio'):
libraries['aubio'] = LibraryInfo()
libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
env['AUBIO'] = 1
else:
env['AUBIO'] = 0
env = conf.Finish ()
@ -544,18 +547,6 @@ if env['FFT_ANALYSIS']:
sys.exit (1)
conf.Finish()
if env['AUBIO']:
#
# Check for aubio header as well as the library
#
conf = Configure(libraries['aubio'])
if conf.CheckHeader ('aubio/aubio.h') == False:
print ('AUBIO-related features be compiled without the aubio headers, which do not seem to be installed')
env['AUBIO'] = 0
conf.Finish()
if env['FREESOUND']:
#
# Check for curl header as well as the library
@ -844,8 +835,9 @@ 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(CPPPATH="/opt/gtk/include", LIBPATH="/opt/gtk/lib")
libinfo.Append(CXXFLAGS="-I/opt/gtk/include", LINKFLAGS="-L/opt/gtk/lib")
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")

2
gtk2_ardour/SConscript
View file

@ -406,7 +406,7 @@ my_subst_dict = { }
keybindings_dict = { }
if gtkardour['GTKOSX'] and gtkardour['NATIVE_OSX_KEYS']:
if gtkardour['GTKOSX']:
#
# Command(Meta), Alt(Mod1), Ctrl, Shift
# **** as of february 4th 2008, OUR VERSION OF *****