| 1 | |
|---|
| 2 | New patches: |
|---|
| 3 | |
|---|
| 4 | [Fix building problem for Mac OS X |
|---|
| 5 | shelarcy <shelarcy@capella.freemail.ne.jp>**20060907023009] { |
|---|
| 6 | hunk ./aclocal.m4 171 |
|---|
| 7 | + |
|---|
| 8 | +# FP_CHECK_OPENAL |
|---|
| 9 | +# ------------- |
|---|
| 10 | +AC_DEFUN([FP_CHECK_OPENAL], |
|---|
| 11 | +[AC_REQUIRE([AC_CANONICAL_TARGET]) |
|---|
| 12 | +AL_CFLAGS= |
|---|
| 13 | +case $target_os in |
|---|
| 14 | +darwin*) |
|---|
| 15 | + AL_LIBS= |
|---|
| 16 | + AL_FRAMEWORKS=OpenAL |
|---|
| 17 | + ;; |
|---|
| 18 | +*) |
|---|
| 19 | + AC_SEARCH_LIBS([alGenSources], [openal openal32], [AL_LIBS="$ac_cv_search_alGenSources"]) |
|---|
| 20 | + test x"$AL_LIBS" = x"none required" && AL_LIBS= |
|---|
| 21 | + AC_SUBST([AL_LIBS]) |
|---|
| 22 | + AL_FRAMEWORKS= |
|---|
| 23 | + ;; |
|---|
| 24 | +esac |
|---|
| 25 | +AC_SUBST([AL_CFLAGS]) |
|---|
| 26 | +AC_SUBST([AL_FRAMEWORKS]) |
|---|
| 27 | +])# FP_CHECK_OPENAL |
|---|
| 28 | + |
|---|
| 29 | hunk ./configure.ac 11 |
|---|
| 30 | -# Shall we build this package at all? |
|---|
| 31 | -FP_ARG_OPENAL |
|---|
| 32 | hunk ./configure.ac 13 |
|---|
| 33 | -if test x"$enable_openal" = xyes; then |
|---|
| 34 | - |
|---|
| 35 | hunk ./configure.ac 15 |
|---|
| 36 | -# The following test for the OpenAL library is a bit of a hack, but gives nice |
|---|
| 37 | -# feedback even for the case when no additional library is needed. (Mac OS X?) |
|---|
| 38 | -AL_LIBS=no |
|---|
| 39 | -AC_SEARCH_LIBS([alGenSources], [openal openal32], [AL_LIBS="$ac_cv_search_alGenSources"]) |
|---|
| 40 | -test x"$AL_LIBS" = x"none required" && AL_LIBS= |
|---|
| 41 | -AC_SUBST([AL_LIBS]) |
|---|
| 42 | +# Shall we build this package at all? |
|---|
| 43 | +FP_ARG_OPENAL |
|---|
| 44 | + |
|---|
| 45 | +if test x"$enable_openal" = xyes; then |
|---|
| 46 | + |
|---|
| 47 | +# Check for ALUT include paths and libraries |
|---|
| 48 | +FP_CHECK_OPENAL |
|---|
| 49 | hunk ./configure.ac 27 |
|---|
| 50 | -# Ugly... |
|---|
| 51 | -AL_FRAMEWORKS= |
|---|
| 52 | -case $host_os in |
|---|
| 53 | -darwin*) |
|---|
| 54 | - AL_FRAMEWORKS=OpenAL |
|---|
| 55 | - ;; |
|---|
| 56 | -esac |
|---|
| 57 | -AC_SUBST([AL_FRAMEWORKS]) |
|---|
| 58 | - |
|---|
| 59 | +# check for ALUT include files |
|---|
| 60 | hunk ./configure.ac 30 |
|---|
| 61 | -if test -z "$AL_FRAMEWORKS" && test x"$fp_found_al_header$fp_found_alc_header" != xyesyes; then |
|---|
| 62 | + |
|---|
| 63 | +if test x"$fp_found_al_header" = xno || test x"$fp_found_alc_header" = xno; then |
|---|
| 64 | hunk ./configure.ac 185 |
|---|
| 65 | -*-mingw32) CALLCONV=stdcall ;; |
|---|
| 66 | +# WinDoze DLL hell |
|---|
| 67 | +# NOTE: For some obscure/unknown reason, OpenAL uses ccall, even on WinDoze... |
|---|
| 68 | +# *-mingw32) CALLCONV=stdcall ;; |
|---|
| 69 | } |
|---|
| 70 | |
|---|
| 71 | Context: |
|---|
| 72 | |
|---|
| 73 | [includes -> install-includes |
|---|
| 74 | Ross Paterson <ross@soi.city.ac.uk>**20060829123744] |
|---|
| 75 | [exclude Setup.hs even if not building package |
|---|
| 76 | Ross Paterson <ross@soi.city.ac.uk>**20060825222702] |
|---|
| 77 | [exclude Setup.hs from build |
|---|
| 78 | Ross Paterson <ross@soi.city.ac.uk>**20060824183534] |
|---|
| 79 | [add boilerplate Setup.hs |
|---|
| 80 | Ross Paterson <ross@soi.city.ac.uk>**20060824115102] |
|---|
| 81 | [add files used by configure |
|---|
| 82 | Ross Paterson <ross@soi.city.ac.uk>**20060518174356] |
|---|
| 83 | [Fixed bug #715 (OpenAL package fails to compile with older headers) |
|---|
| 84 | Sven Panne <sven.panne@aedion.de>**20060507164755] |
|---|
| 85 | [TAG Initial conversion from CVS complete |
|---|
| 86 | John Goerzen <jgoerzen@complete.org>**20060112154136] |
|---|
| 87 | Patch bundle hash: |
|---|
| 88 | f96adc3351c29eb8bdee0deeebd721ee8c0812a1 |
|---|
