124 lines
4.3 KiB
Text
124 lines
4.3 KiB
Text
--- SConstruct.orig Wed Jan 17 22:13:21 2007
|
|
+++ SConstruct Wed Jan 17 22:55:30 2007
|
|
@@ -38,7 +38,7 @@
|
|
BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
|
|
BoolOption('LIBLO', 'Compile with support for liblo library', 1),
|
|
BoolOption('NLS', 'Set to turn on i18n support', 1),
|
|
- PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
|
|
+ PathOption('PREFIX', 'Set the install "prefix"', '/usr/local', PathOption.PathIsDirCreate),
|
|
BoolOption('SURFACES', 'Build support for control surfaces', 1),
|
|
BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
|
|
BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
|
|
@@ -655,13 +655,7 @@
|
|
# prepend boiler plate optimization flags
|
|
#
|
|
|
|
-opt_flags[:0] = [
|
|
- "-O3",
|
|
- "-fomit-frame-pointer",
|
|
- "-ffast-math",
|
|
- "-fstrength-reduce",
|
|
- "-fno-strict-aliasing"
|
|
- ]
|
|
+opt_flags[:0] = [ "%%CFLAGS%%" ];
|
|
|
|
if env['DEBUG'] == 1:
|
|
env.Append(CCFLAGS=" ".join (debug_flags))
|
|
@@ -742,9 +736,9 @@
|
|
prep_libcheck(env, libraries['lo'])
|
|
|
|
conf = Configure (libraries['lo'])
|
|
- if conf.CheckLib ('lo', 'lo_server_new') == False:
|
|
- print "liblo does not appear to be installed."
|
|
- sys.exit (1)
|
|
+# if conf.CheckLib ('lo', 'lo_server_new') == False:
|
|
+# print "liblo does not appear to be installed."
|
|
+# sys.exit (1)
|
|
|
|
libraries['lo'] = conf.Finish ()
|
|
|
|
@@ -784,8 +778,10 @@
|
|
subst_dict['%MIDITAG%'] = "ardour"
|
|
subst_dict['%MIDITYPE%'] = "coremidi"
|
|
else:
|
|
- print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."
|
|
- sys.exit (1)
|
|
+ libraries['sysmidi'] = LibraryInfo (LIBS='lo')
|
|
+ env['SYSMIDI'] = 'none'
|
|
+ subst_dict['%MIDITAG%'] = "none"
|
|
+ subst_dict['%MIDITYPE%'] = "none"
|
|
|
|
env = conf.Finish()
|
|
|
|
@@ -1006,33 +1002,33 @@
|
|
# i18n support
|
|
#
|
|
|
|
-conf = Configure (env)
|
|
-if env['NLS']:
|
|
- nls_error = 'This system is not configured for internationalized applications. An english-only version will be built:'
|
|
- print 'Checking for internationalization support ...'
|
|
- have_gettext = conf.TryAction(Action('xgettext --version'))
|
|
- if have_gettext[0] != 1:
|
|
- nls_error += ' No xgettext command.'
|
|
- env['NLS'] = 0
|
|
- else:
|
|
- print "Found xgettext"
|
|
-
|
|
- have_msgmerge = conf.TryAction(Action('msgmerge --version'))
|
|
- if have_msgmerge[0] != 1:
|
|
- nls_error += ' No msgmerge command.'
|
|
- env['NLS'] = 0
|
|
- else:
|
|
- print "Found msgmerge"
|
|
-
|
|
- if not conf.CheckCHeader('libintl.h'):
|
|
- nls_error += ' No libintl.h.'
|
|
- env['NLS'] = 0
|
|
-
|
|
- if env['NLS'] == 0:
|
|
- print nls_error
|
|
- else:
|
|
- print "International version will be built."
|
|
-env = conf.Finish()
|
|
+#conf = Configure (env)
|
|
+#if env['NLS']:
|
|
+# nls_error = 'This system is not configured for internationalized applications. An english-only version will be built:'
|
|
+# print 'Checking for internationalization support ...'
|
|
+# have_gettext = conf.TryAction(Action('xgettext --version'))
|
|
+# if have_gettext[0] != 1:
|
|
+# nls_error += ' No xgettext command.'
|
|
+# env['NLS'] = 0
|
|
+# else:
|
|
+# print "Found xgettext"
|
|
+#
|
|
+# have_msgmerge = conf.TryAction(Action('msgmerge --version'))
|
|
+# if have_msgmerge[0] != 1:
|
|
+# nls_error += ' No msgmerge command.'
|
|
+# env['NLS'] = 0
|
|
+# else:
|
|
+# print "Found msgmerge"
|
|
+#
|
|
+# if not conf.CheckCHeader('libintl.h'):
|
|
+# nls_error += ' No libintl.h.'
|
|
+# env['NLS'] = 0
|
|
+#
|
|
+# if env['NLS'] == 0:
|
|
+# print nls_error
|
|
+# else:
|
|
+# print "International version will be built."
|
|
+#env = conf.Finish()
|
|
|
|
if env['NLS'] == 1:
|
|
env.Append(CCFLAGS="-DENABLE_NLS")
|
|
@@ -1049,8 +1045,8 @@
|
|
subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
|
|
subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
|
|
else:
|
|
- subst_dict['%JACK_INPUT%'] = "alsa_pcm:playback_"
|
|
- subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_"
|
|
+ subst_dict['%JACK_INPUT%'] = "oss:playback_"
|
|
+ subst_dict['%JACK_OUTPUT%'] = "oss:capture_"
|
|
|
|
# posix_memalign available
|
|
if not conf.CheckFunc('posix_memalign'):
|