Changeset 18759

Timestamp:

04/25/06 10:33:00 (3 years ago)

Author:

patrick

Message:

SF Bug#: 1475715

Handle the use of OpenAL 1.1 and Free ALUT 1.0.1 on Windows.

Files:

• juggler/trunk/buildwin32.py (modified) (3 diffs)
• juggler/trunk/vc7/README.html (modified) (1 diff)
• juggler/trunk/vc7/Sonix/OpenAL/OpenAL.vcproj (modified) (4 diffs)

juggler/trunk/buildwin32.py

@@ -221 +221 @@
-                               'OpenAL SDK installation directory', '',
-                               required = False))
+   optional.append(BuildOption('ALUT_ROOT', 'ALUT SDK installation directory',
+                               '', required = False))
-   optional.append(BuildOption('TRACKD_API_ROOT',
-                               'TrackdAPI installation directory', '',
@@ -329 +331 @@
-            os.environ['OMNITHREAD_VERSION'] = match.group(1)
-            break
+
+   # Determine if al.h is in the base include directory or in include\AL.
+   if os.environ['OPENAL_ROOT'] != '':
+      # TODO: Extend for Win64.
+      lib_dirs = [os.path.join(os.environ['OPENAL_ROOT'], 'libs'),
+                  os.path.join(os.environ['OPENAL_ROOT'], 'libs', 'Win32')]
+
+      for l in lib_dirs:
+         openal_lib = os.path.join(l, 'OpenAL32.lib')
+         if os.path.exists(openal_lib):
+            os.environ['OPENAL_LIB_DIR'] = l
+            break
+
+      header_file = os.path.join(os.environ['OPENAL_ROOT'], 'include', 'AL',
+                                 'al.h')
+      # If the file is include\AL\al.h, then set the environment variable
+      # %HAVE_AL_AL_H% to the preprocessor symbol 'HAVE_AL_AL_H'.
+      # See modules/sonix/plugins/OpenAL/OpenALSoundImplementation.cpp.
+      if os.path.exists(header_file):
+         os.environ['HAVE_AL_AL_H'] = 'HAVE_AL_AL_H'
+
+   # Determine if alut.h is in the base include directory or in include\AL.
+   openal_envs = ['ALUT_ROOT', 'OPENAL_ROOT']
+   for env in openal_envs:
+      if os.environ[env] != '':
+         header_file = os.path.join(os.environ[env], 'include', 'AL', 'alut.h')
+         # If the file is include\AL\alut.h, then set the environment variable
+         # %HAVE_AL_ALUT_H% to the preprocessor symbol 'HAVE_AL_ALUT_H'.
+         # See modules/sonix/plugins/OpenAL/OpenALSoundImplementation.cpp.
+         if os.path.exists(header_file):
+            os.environ['HAVE_AL_ALUT_H'] = 'HAVE_AL_ALUT_H'
+
+   # If the ALUT installation directory is not set, then assume that it is the
+   # same as the OpenAL installation directory.
+   if os.environ['ALUT_ROOT'] == '' and os.environ['OPENAL_ROOT'] != '':
+      os.environ['ALUT_ROOT'] = os.environ['OPENAL_ROOT']
-
-   if os.environ['TRACKD_API_ROOT'] != '' and os.path.exists(os.environ['TRACKD_API_ROOT']):
@@ -1436 +1474 @@
-
-def installOpenAL(prefix):
-printStatus("Installing OpenAL DLL")
-
+srcdir = os.environ['OPENAL_ROOT']
+
-   if srcdir != "":
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def installOmniORB(prefix):

juggler/trunk/vc7/README.html

@@ -252 +252 @@
-    The root directory of an
-    <a href="http://www.openal.org/downloads.html">OpenAL SDK</a> 1.0 or newer
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </dd>
-  <dt><tt>TRACKD_API_ROOT</tt></dt>

juggler/trunk/vc7/Sonix/OpenAL/OpenAL.vcproj

@@ -20 +20 @@
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-
-
+ALUT_ROOT)\include";"$(
+;$(HAVE_AL_AL_H);$(HAVE_AL_ALUT_H)
-                                MinimalRebuild="FALSE"
-                                BasicRuntimeChecks="3"
@@ -40 +40 @@
-                                Version="1.1.1"
-                                LinkIncremental="1"
-ROOT)\libs
+LIB_DIR)";"$(ALUT_ROOT)\lib
-                                GenerateDebugInformation="TRUE"
-                                ProgramDatabaseFile="$(OutDir)/OpenALPlugin.pdb"
@@ -72 +72 @@
-                                InlineFunctionExpansion="1"
-                                OmitFramePointers="TRUE"
-
-
+ALUT_ROOT)\include";"$(
+;$(HAVE_AL_AL_H);$(HAVE_AL_ALUT_H)
-                                StringPooling="TRUE"
-                                MinimalRebuild="FALSE"
@@ -93 +93 @@
-                                Version="1.1.1"
-                                LinkIncremental="1"
-ROOT)\libs
+LIB_DIR)";"$(ALUT_ROOT)\lib
-                                GenerateDebugInformation="TRUE"
-                                ProgramDatabaseFile="$(OutDir)/OpenALPlugin.pdb"