Changeset 19794

Timestamp:

02/02/07 14:10:36 (2 years ago)

Author:

patrick

Message:

Fixed two packaging errors for OpenAL and ALUT:

1. Check CWINDOWS\SysWOW64 for OpenAL32.dll since that's where it ends
   up on 64-bit Windows.
   
2. Reference the correct variable when installing alut.dll (in the case
   when ALUT is installed separately from OpenAL).
   

Files:

• juggler/branches/2.0/buildwin32.py (modified) (3 diffs)

juggler/branches/2.0/buildwin32.py

@@ -1537 +1537 @@
-      # OpenAL 1.0 and 1.1 put the redistributable DLL in different places.
-      dll_dirs = [os.path.join(srcdir, 'dll'),
+                  os.path.join(r'C:\windows', 'SysWOW64'),
-                  os.path.join(r'C:\windows', 'system32')]
-
@@ -1543 +1544 @@
-         if os.path.exists(dll):
-            smartCopy(dll, destdir)
+            break
-
-   srcdir = os.environ['ALUT_ROOT']
@@ -1551 +1553 @@
-      alut_dll = os.path.join(srcdir, 'lib', 'alut.dll')
-      if os.path.exists(alut_dll):
-
+alut_
-
-def installOmniORB(prefix):