continue with MTC debugging

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 825fa2a5d23242acc2a8f0b9c8d6d5d641b01096..81b5f058816c626475ee57616938789664ecb693 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -18,6 +18,9 @@ import commands
 from sets import Set
 import SCons.Node.FS
 
+print "\n----------------------------------------\nPlease build Ardour 3.X using waf:\n\n./waf configure\n./waf"
+exit (0)
+
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
@@ -32,7 +35,7 @@ subst_dict = { }
 opts = Options('scache.conf')
 opts.AddOptions(
     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
-    ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'),
+    ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4><Super'),
     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),
@@ -290,7 +293,7 @@ def create_stored_revision (target = None, source = None, env = None):
             sys.exit (-1)
 
     try:
-       text  = "#include <ardour/svn_revision.h>\n"
+       text  = "#include \"ardour/svn_revision.h\"\n"
        text += "namespace ARDOUR {\n";
        text += "extern const char* svn_revision = \"" + rev + "\";\n";
        text += "}\n";
@@ -424,9 +427,11 @@ env.Append (BUILDERS = {'Tarball' : tarball_bld})
 def pushEnvironment(context):
     if os.environ.has_key('PATH'):
        context.Append(PATH = os.environ['PATH'])
+       context['ENV']['PATH'] = os.environ['PATH']
        
     if os.environ.has_key('PKG_CONFIG_PATH'):
        context.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH'])
+       context['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
            
     if os.environ.has_key('CC'):
        context['CC'] = os.environ['CC']
@@ -575,7 +580,7 @@ if env['LV2']:
        if conf.CheckPKGVersion('slv2', '0.6.4'):
                libraries['slv2'] = LibraryInfo()
                libraries['slv2'].ParseConfig('pkg-config --cflags --libs slv2')
-                env.Append (CCFLAGS="-DHAVE_LV2")
+                env.Append (CCFLAGS="-DHAVE_SLV2")
        else:
                print 'LV2 support is not enabled (SLV2 not found or older than 0.6.4 (svn))'
                env['LV2'] = 0
@@ -604,6 +609,10 @@ libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gmodule-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0')
 
+libraries['gio'] = LibraryInfo()
+libraries['gio'].ParseConfig('pkg-config --cflags --libs gio-2.0')
+libraries['gio'].ParseConfig('pkg-config --cflags --libs gio-unix-2.0')
+
 libraries['freetype2'] = LibraryInfo()
 libraries['freetype2'].ParseConfig ('pkg-config --cflags --libs freetype2')
 
@@ -774,6 +783,17 @@ if env['DIST_TARGET'] == 'x86_64':
 else:
     env['LIBDIR']='lib'
 
+#
+# no VST on x86_64
+#
+
+if env['DIST_TARGET'] == 'x86_64' and env['VST']:
+    print "\n\n=================================================="
+    print "You cannot use VST plugins with a 64 bit host. Please run scons with VST=0"
+    print "\nIt is theoretically possible to build a 32 bit host on a 64 bit system."
+    print "However, this is tricky and not recommended for beginners."
+    sys.exit (-1)
+
 #
 # a single way to test if we're on OS X
 #
@@ -1045,7 +1065,7 @@ elif conf.CheckCHeader('alsa/asoundlib.h'):
     libraries['sysmidi'] = LibraryInfo ()
     libraries['sysmidi'].ParseConfig('pkg-config --cflags --libs alsa')
     env['SYSMIDI'] = 'ALSA Sequencer'
-    subst_dict['%MIDITAG%'] = "seq"
+    subst_dict['%MIDITAG%'] = "control"
     subst_dict['%MIDITYPE%'] = "alsa/sequencer"
     print "Using ALSA MIDI"
 elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
@@ -1095,6 +1115,8 @@ if env['SYSLIBS']:
     libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0')
     libraries['glibmm2'] = LibraryInfo()
     libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4')
+    libraries['giomm'] = LibraryInfo()
+    libraries['giomm'].ParseConfig('pkg-config --cflags --libs giomm-2.4')
     libraries['cairo'] = LibraryInfo()
     libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo')
     libraries['cairomm'] = LibraryInfo()
@@ -1172,6 +1194,9 @@ else:
     libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2',
                                     LIBPATH='#libs/glibmm2',
                                     CPPPATH='#libs/glibmm2/glib')
+    libraries['giomm'] = LibraryInfo(LIBS='giomm',
+                                    LIBPATH='#libs/glibmm2',
+                                    CPPPATH='#libs/glibmm2/gio')
     libraries['pangomm'] = LibraryInfo(LIBS='pangomm',
                                     LIBPATH='#libs/gtkmm2/pango',
                                     CPPPATH='#libs/gtkmm2/pango')
@@ -1463,12 +1488,12 @@ create_stored_revision()
 # the subdirs
 #
 
-for subdir in coredirs:
-    SConscript (subdir + '/SConscript')
+#for subdir in coredirs:
+#    SConscript (subdir + '/SConscript')
 
-for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]:
-    for subdir in sublistdir:
-        SConscript (subdir + '/SConscript')
+#for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]:
+#    for subdir in sublistdir:
+#        SConscript (subdir + '/SConscript')
 
 # cleanup
 env.Clean ('scrub', [ 'scache.conf', '.sconf_temp', '.sconsign.dblite', 'config.log'])