diff options
| author | Sampo Savolainen <v2@iki.fi> | 2008-11-26 15:36:32 +0000 |
|---|---|---|
| committer | Sampo Savolainen <v2@iki.fi> | 2008-11-26 15:36:32 +0000 |
| commit | a0f1865c68166d984b2cb67451f25e76ef9cdb52 (patch) | |
| tree | 93e8a11520071f961ec0c59e2a87fdfdc286e9e8 | |
| parent | 676916c85d1a09cc444d16ef90f6c00dfba16739 (diff) | |
Make the wiimote code appear in the source package
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4264 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 13 | ||||
| -rw-r--r-- | libs/surfaces/wiimote/SConscript | 6 |
2 files changed, 8 insertions, 11 deletions
diff --git a/SConstruct b/SConstruct index 2adb17394a..8996672211 100644 --- a/SConstruct +++ b/SConstruct @@ -579,10 +579,7 @@ if env['LV2']: else: print 'LV2 support is not enabled. Build with \'scons LV2=1\' to enable.' -if env['WIIMOTE']: - wiimote_surface = [ 'libs/surfaces/wiimote' ] -else: - wiimote_surface = [ ] +if not env['WIIMOTE']: print 'WIIMOTE not enabled. Build with \'scons WIIMOTE=1\' to enable support.' libraries['jack'] = LibraryInfo() @@ -1212,17 +1209,17 @@ else: # # * always build the LGPL control protocol lib, since we link against it from libardour # * ditto for generic MIDI -# * tranzport checks whether it should build internally, but we need here so that -# its included in the tarball +# * tranzport & wiimote check whether they should build internally, but we need them here +# so that they are included in the tarball # surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi', 'libs/surfaces/tranzport', 'libs/surfaces/mackie', - 'libs/surfaces/powermate' + 'libs/surfaces/powermate', + 'libs/surfaces/wiimote' ] -surface_subdirs += wiimote_surface if env['SURFACES']: if have_libusb: diff --git a/libs/surfaces/wiimote/SConscript b/libs/surfaces/wiimote/SConscript index abfd40e534..df3d61f7ae 100644 --- a/libs/surfaces/wiimote/SConscript +++ b/libs/surfaces/wiimote/SConscript @@ -47,12 +47,12 @@ wiimote.Merge ([ libardour_wiimote = wiimote.SharedLibrary('ardour_wiimote', wiimote_files) -Default(libardour_wiimote) +if wiimote['WIIMOTE']: + Default(libardour_wiimote) + env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_wiimote)) if env['NLS']: i18n (wiimote, wiimote_files, env) - -env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_wiimote)) env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + |