Changeset 357:fa1c2743f6d8

Timestamp:

03/26/10 19:43:37 (3 years ago)

Author:

rkuck

Branch:

default

Convert:

svn:76c98907-0e80-4c83-94c7-b346fc2aefc2/trunk@363

Message:

Added avango-utils module.

This is experimental at the moment and needs to be explicitly activated
(using UTILS_SUPPORT in the localdefs.py file).

Files:

• SConstruct (modified) (2 diffs)
• avango-utils/SConscript (added)
• avango-utils/include/avango/utils/Init.h (added)
• avango-utils/include/avango/utils/ProximitySensor.h (added)
• avango-utils/include/avango/utils/SConscript (added)
• avango-utils/include/avango/utils/windows_specific_utils.h (added)
• avango-utils/python/SConscript (added)
• avango-utils/python/_MFMerger.py (added)
• avango-utils/python/__init__.py (added)
• avango-utils/python/_utils.cpp (added)
• avango-utils/src/Init.cpp (added)
• avango-utils/src/ProximitySensor.cpp (added)
• avango-utils/src/SConscript (added)
• avango-utils/tests/SConscript (added)
• avango-utils/tests/TestMFMerger.py (added)
• avango-utils/tests/TestProximitySensor.py (added)
• avango-utils/tests/__init__.py (added)
• avango-utils/tests/runtests.py (added)

SConstruct

@@ -57 +57 @@
                'Enable VRPN support for the AvangoDaemon module',
                False),
+    BoolOption('UTILS_SUPPORT',
+               'Enable building utility module (EXPERIMENTAL)',
+               False),
     )
 
@@ -110 +113 @@
         
 if not avango.build.oshelper.os_is_windows() and \
-         not avango.build.oshelper.os_is_mac(): #FIXME get module running under Windows/MAC
+   not avango.build.oshelper.os_is_mac(): #FIXME get module running under Windows/MAC
     avango.build.SConscript('avango-sound/SConscript')
 if env['OPENAL_SUPPORT']:
     avango.build.SConscript('avango-openal/SConscript')
-avango.build.SConscript('avango-tools/SConscript')    
+avango.build.SConscript('avango-tools/SConscript')
 if env['DISPLAY_SUPPORT']:
     avango.build.SConscript('avango-display/SConscript')
 if env['CONNECT_SUPPORT']:
     avango.build.SConscript('avango-connect/SConscript')
+if env['UTILS_SUPPORT']:
+    avango.build.SConscript('avango-utils/SConscript')
 avango.build.SConscript('avango-inspector/SConscript')
 avango.build.SConscript('avango-doc/SConscript')