Changeset 20154

Timestamp:

05/07/07 09:03:59 (2 years ago)

Author:

patrick

Message:

Connect the noDNA X-IST data glove driver to the Windows build.

Files:

• juggler/trunk/README-WINDOWS.html (modified) (1 diff)
• juggler/trunk/build_windows.py (modified) (2 diffs)
• juggler/trunk/vc7/Gadgeteer/X-IST (added)
• juggler/trunk/vc7/Gadgeteer/X-IST/X-IST.vcproj (added)
• juggler/trunk/vc7/Juggler.sln (modified) (3 diffs)
• juggler/trunk/vc8/Gadgeteer/X-IST (added)
• juggler/trunk/vc8/Gadgeteer/X-IST/X-IST.vcproj (added)
• juggler/trunk/vc8/Juggler.sln (modified) (2 diffs)

juggler/trunk/README-WINDOWS.html

@@ -291 +291 @@
-    <tt>&lt;trackdAPI_CC.h&gt;</tt>.
-  </dd>
+  <dt><tt>FTD2XX_ROOT</tt></dt>
+  <dd>
+    The root directory of an
+    <a href="http://www.ftdichip.com/Drivers/D2XX.htm">FTD2XX SDK</a>
+    installation. This is required to build the driver for the
+    <a href="http://www.x-ist.de/noDNA_X-IST.394.0.html?&L=1">noDNA X-IST</a>
+    data glove.
+  </dd>
+  <dt><tt>DOOZER_ROOT</tt></dt>
+  <dd>
+    The root directory of a <a href="http://">Doozer 2.1</a> installation.
+  </dd>
-</dl>
-

juggler/trunk/build_windows.py

@@ -273 +273 @@
-   optional.append(BuildOption('TRACKD_API_ROOT',
-                               'TrackdAPI installation directory', '',
+                               required = False))
+   optional.append(BuildOption('FTD2XX_ROOT',
+                               'FTD2XX SDK installation directory', '',
-                               required = False))
-   optional.append(BuildOption('DOOZER_ROOT',
@@ -1425 +1428 @@
-              'Fastrak', 'Flock', 'IBox', 'IntersenseAPI', 'IS900',
-              'MotionStar', 'MSFTSpeechRecognition', 'PinchGlove',
-
+
+
-
-   for d in drivers:
-      srcdir = os.path.join(srcroot, d)
-      installLibs(srcdir, destdir, extensions = ['.dll'])
+
+   srcdir = os.environ['FTD2XX_ROOT']
+   if srcdir != "":
+      printStatus("Installing FTD2XX DLL")
+      destdir = os.path.join(prefix, 'bin')
+
+      ftd2xx_dll = os.path.join(srcdir, 'FTD2XX.dll')
+      if os.path.exists(ftd2xx_dll):
+         smartCopy(ftd2xx_dll, destdir)
-
-def installGadgeteerPlugins(prefix, buildDir):

juggler/trunk/vc7/Juggler.sln

@@ -269 +269 @@
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VR Juggler CORBA Performance Monitoring Plug-in IDL to C++", "VRJugglerPlugins\Perf_Plugin_CXX_IDL\Perf_Plugin_CXX_IDL.vcproj", "{C2C59AA2-CD5B-49EF-B1B0-858AC44B1FD9}"
-        ProjectSection(ProjectDependencies) = postProject
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Driver - noDNA X-IST Data Glove", "Gadgeteer\X-IST\X-IST.vcproj", "{D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}"
+        ProjectSection(ProjectDependencies) = postProject
+                {1AAD8712-09DC-4957-8594-AF5A49BAB4E1} = {1AAD8712-09DC-4957-8594-AF5A49BAB4E1}
+                {00C860E8-6CC8-4638-B5D1-8E5C5A34C425} = {00C860E8-6CC8-4638-B5D1-8E5C5A34C425}
+                {5A96B2F8-7000-4988-AFD5-E85181B52BCF} = {5A96B2F8-7000-4988-AFD5-E85181B52BCF}
-        EndProjectSection
-EndProject
@@ -277 +284 @@
-                Release = Release
-                ReleaseDLL = ReleaseDLL
+        EndGlobalSection
+        GlobalSection(ProjectDependencies) = postSolution
-        EndGlobalSection
-        GlobalSection(ProjectConfiguration) = postSolution
@@ -603 +612 @@
-                {C2C59AA2-CD5B-49EF-B1B0-858AC44B1FD9}.ReleaseDLL.ActiveCfg = ReleaseDLL|Win32
-                {C2C59AA2-CD5B-49EF-B1B0-858AC44B1FD9}.ReleaseDLL.Build.0 = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug.Build.0 = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL.Build.0 = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release.Build.0 = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL.Build.0 = ReleaseDLL|Win32
-        EndGlobalSection
-        GlobalSection(SolutionItems) = postSolution

juggler/trunk/vc8/Juggler.sln

@@ -267 +267 @@
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VR Juggler Direct3D Draw Manager", "VRJuggler\Direct3D_Draw_Manager\Direct3D_Draw_Manager.vcproj", "{927ADA64-5D2E-4066-ABDA-3D65A9CF524B}"
-        ProjectSection(ProjectDependencies) = postProject
+                {5A96B2F8-7000-4988-AFD5-E85181B52BCF} = {5A96B2F8-7000-4988-AFD5-E85181B52BCF}
+                {00C860E8-6CC8-4638-B5D1-8E5C5A34C425} = {00C860E8-6CC8-4638-B5D1-8E5C5A34C425}
+                {8CD85B68-8E87-4289-9CD3-0C0012781BF2} = {8CD85B68-8E87-4289-9CD3-0C0012781BF2}
+                {1AAD8712-09DC-4957-8594-AF5A49BAB4E1} = {1AAD8712-09DC-4957-8594-AF5A49BAB4E1}
-                {BE8A6412-F142-493F-B1BB-363F4EDAC230} = {BE8A6412-F142-493F-B1BB-363F4EDAC230}
-
-
-
-
+
+
+
+
+
+
+
-        EndProjectSection
-EndProject
@@ -961 +968 @@
-                {927ADA64-5D2E-4066-ABDA-3D65A9CF524B}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
-                {927ADA64-5D2E-4066-ABDA-3D65A9CF524B}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug|Win32.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug|Win32.Build.0 = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug|x64.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL|x64.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release|Win32.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release|Win32.Build.0 = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release|x64.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|Win32
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution