Changeset 19399

Timestamp:

11/02/06 13:53:25 (2 years ago)

Author:

patrick

Message:

Merged Doozer++ 2.1.4 from its vendor branch.

Files:

• juggler/trunk/Doozer++/ChangeLog (modified) (1 diff)
• juggler/trunk/Doozer++/RELEASE_NOTES.txt (modified) (1 diff)
• juggler/trunk/Doozer++/config/general.m4 (modified) (2 diffs)
• juggler/trunk/Doozer++/config/pkgs/alut.m4 (added)
• juggler/trunk/Doozer++/config/pkgs/openal.m4 (modified) (9 diffs)

juggler/trunk/Doozer++/ChangeLog

@@ -1 +1 @@
-DATE       AUTHOR       CHANGE
----------- ------------ -------------------------------------------------------
+2006-11-02 patrickh     Separated the ALUT test from DPP_HAVE_OPENAL. The new
+                        way to test for ALUT is to use DPP_HAVE_ALUT.
+                        NEW VERSION: 2.1.4
-2006-08-31 patrickh     Callers of DPP_ABI_SETUP can now override the default
-                        set of architectures targeted when making universal

juggler/trunk/Doozer++/RELEASE_NOTES.txt

@@ -33 +33 @@
-          conventions, including the use of versioning in any manner
-          desired.
+
+        * The tests for OpenAL and ALUT have been separated into
+          DPP_HAVE_OPENAL and DPP_HAVE_ALUT.
-
- Version: 2.0.0

juggler/trunk/Doozer++/config/general.m4

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          general.m4,v
-08/31 15:48:09
-6
+11/02 17:31:43
+7
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -47 +47 @@
-dnl ===========================================================================
-
-6 2006/08/31 15:48:09
+7 2006/11/02 17:31:43
-
-dnl Set the version of Doozer++.
-3
+4
-
-dnl ---------------------------------------------------------------------------

juggler/trunk/Doozer++/config/pkgs/openal.m4

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          openal.m4,v
-05/26 22:41:56
-2
+11/02 17:31:43
+3
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -41 +41 @@
-dnl     OALROOT     - The OpenAL installation directory.
-dnl     LIBOPENAL   - The list of libraries to link for OpenAL appliations.
-dnl     LIBALUT     - The list of libraries to link for ALUT appliations.
-dnl     AL_INCLUDES - Extra include path for the OpenAL header directory.
-dnl     AL_LDFLAGS  - Extra linker flags for the OpenAL library directory.
-dnl ===========================================================================
-
-2 2006/05/26 22:41:56
+3 2006/11/02 17:31:43
-
-dnl ---------------------------------------------------------------------------
@@ -73 +72 @@
-   OPENAL='no'
-   LIBOPENAL=''
-   LIBALUT=''
-   AL_INCLUDES=''
-   AL_LDFLAGS=''
@@ -123 +121 @@
-dnl         LDFLAGS="/link /libpath:\"$OALROOT/libs\" $LDFLAGS"
-         LDFLAGS="-L\"$OALROOT/libs\" $LDFLAGS"
-ALut.lib 
+
-
-         AC_CACHE_CHECK([for alEnable in OpenAL32.lib],
@@ -175 +173 @@
-      dnl Other platforms.
-      else
-         dpp_saveLDFLAGS="$LDFLAGS"
-
-         DPP_LANG_SAVE
-         DPP_LANG_C
@@ -190 +186 @@
-            [$DYN_LOAD_LIB -lm])
-
-         AC_CHECK_LIB([alut], [alutInit],
-            [AC_CHECK_HEADER([AL/alut.h], [dpp_have_alut='yes'],
-               [dpp_have_alut='no'])],
-            [dpp_have_alut='no'],
-            [$DYN_LOAD_LIB -lopenal -lm])
-
-         dnl This is necessary because AC_CHECK_LIB() adds -lopenal to
-         dnl $LIBS.  We want to do that ourselves later.
-         LIBS="$dpp_save_LIBS"
-
-         dnl Success.
-         if test "x$dpp_have_openal" = "xyes" ; then
@@ -216 +202 @@
-         if test "x$OS_TYPE" = "xWin32" ;  then
-            LIBOPENAL='OpenAL32.lib'
-            LIBALUT='ALut.lib'
-         elif test "x$PLATFORM" = "xDarwin" ; then
-            LIBOPENAL='-framework OpenAL'
-         else
-            LIBOPENAL="-lopenal -lm"
-            if test "x$dpp_have_alut" = "xyes" ; then
-               LIBALUT="-lalut"
-            fi
-         fi
-
@@ -250 +232 @@
-      CPPFLAGS="$dpp_save_CPPFLAGS"
-      LDFLAGS="$dpp_save_LDFLAGS"
+      LIBS="$dpp_save_LIBS"
-   fi
-
@@ -256 +239 @@
-   AC_SUBST(OALROOT)
-   AC_SUBST(LIBOPENAL)
-   AC_SUBST(LIBALUT)
-   AC_SUBST(AL_INCLUDES)
-   AC_SUBST(AL_LDFLAGS)