diff --git a/configure.ac b/configure.ac index 8d820710a..1da1b937e 100644 --- a/configure.ac +++ b/configure.ac @@ -146,9 +146,7 @@ dnl The check for OpenAL headers depends on the OS, since dnl Apple has the headers in OpenAL/al.h instead of AL/al.h AC_SEARCH_LIBS(alGenBuffers, [openal alut], have_al_lib=yes) -dnl as well as mikmod, since mikmod is only used (but then -dnl it's necessary) when openal is used. We also check for -dnl ogg vorbis support now. +dnl We also check for ogg vorbis support now. dnl we have 4 sound libraries to check, first we check for OpenAL if test x$have_al_lib = xyes; then case "${host}" in @@ -195,13 +193,6 @@ case "${host}" in fi fi - dnl search for mikmod libraries, needed to play mod files with OpenAL - AC_SEARCH_LIBS(MikMod_RegisterDriver, mikmod, have_mikmod_lib=yes) - - if test x$have_mikmod_lib = xyes; then - AC_CHECK_HEADER(mikmod.h, have_mikmod_hdr=yes) - fi - dnl search for the libraries needed to use ogg vorbis AC_SEARCH_LIBS(ov_open, vorbisfile, have_vorbisfile_lib=yes) @@ -225,27 +216,20 @@ case "${host}" in SUMMARY="$SUMMARY You DO NOT have freealut." fi - if test x$have_mikmod_hdr != xyes; then - SUMMARY="$SUMMARY You DO NOT have mikmod." - fi - if test x$have_al_hdr = xyes -a x$alut_version_ok = xyes; then - if test x$have_mikmod_hdr = xyes; then - openal_LIBS="$LIBS" - AC_DEFINE([HAVE_OPENAL], 1, [Defined when OpenAL is available]) - AC_DEFINE([HAVE_MIKMOD], 1, [Defined when mikmod is available]) - SUMMARY="$SUMMARY\nUsing OpenAL for sound." - - if test x$have_vorbisfile_hdr = xyes -a x$have_ogg_hdr = xyes; then - AC_DEFINE([HAVE_OGGVORBIS], 1, [Defined when Ogg Vorbis is available]) - SUMMARY="$SUMMARY\nWe have Ogg Vorbis support." - # ov_read for ogg music needs endianness flag. This macro defines - # WORDS_BIGENDIAN if it's a big endian machine. See music_ogg.cpp - AC_C_BIGENDIAN - fi + openal_LIBS="$LIBS" + AC_DEFINE([HAVE_OPENAL], 1, [Defined when OpenAL is available]) + SUMMARY="$SUMMARY\nUsing OpenAL for sound." + + if test x$have_vorbisfile_hdr = xyes -a x$have_ogg_hdr = xyes; then + AC_DEFINE([HAVE_OGGVORBIS], 1, [Defined when Ogg Vorbis is available]) + SUMMARY="$SUMMARY\nWe have Ogg Vorbis support." + # ov_read for ogg music needs endianness flag. This macro defines + # WORDS_BIGENDIAN if it's a big endian machine. See music_ogg.cpp + AC_C_BIGENDIAN fi else - SUMMARY="$SUMMARY\nInstall OpenAL, freealut and mikmod for better sound!" + SUMMARY="$SUMMARY\nInstall OpenAL and freealut for better sound!" fi LIBS=$save_LIBS @@ -374,7 +358,6 @@ fi AC_SUBST(bullet_LIBS) AC_SUBST(opengl_LIBS) AC_SUBST(openal_LIBS) -AC_SUBST(mikmod_LIBS) AC_SUBST(sdl_LIBS) AC_MSG_CHECKING([for gcc -fno-regmove option ]) @@ -425,7 +408,6 @@ AC_CONFIG_FILES([ \ fonts/Makefile \ images/Makefile \ models/Makefile \ - mods/Makefile \ src/Makefile \ wavs/Makefile \ wavs/radio/Makefile \ diff --git a/data/beach.track b/data/beach.track index 3131932c3..097efad24 100644 --- a/data/beach.track +++ b/data/beach.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "On the Beach") + (name "On the Beach") (description "Created by Ingo Ruhnke") - (music "mods/Boom_boom_boom.mod") - (screenshot "sshot-beach.rgb") - (topview "topview-beach.rgb") + (music "oggs/Boom_boom_boom.ogg") + (screenshot "sshot-beach.rgb") + (topview "topview-beach.rgb") ) ;; EOF ;; diff --git a/data/bsodcastle.track b/data/bsodcastle.track index f5143a47d..8f45df73a 100644 --- a/data/bsodcastle.track +++ b/data/bsodcastle.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "BSODs Battlements") + (name "BSODs Battlements") (description "Created by Oliver & Steve Baker") - (music "oggs/Lava\ Lagoon_2.ogg") - (screenshot "sshot-bsodcastle.rgb") - (topview "topview-bsodcastle.rgb") + (music "oggs/Lava\ Lagoon_2.ogg") + (screenshot "sshot-bsodcastle.rgb") + (topview "topview-bsodcastle.rgb") ) ;; EOF ;; diff --git a/data/geekopeak.track b/data/geekopeak.track index dbf8b5b9a..e92145c88 100644 --- a/data/geekopeak.track +++ b/data/geekopeak.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "Geeko Peak") + (name "Geeko Peak") (description "Created by Oliver & Steve Baker") - (music "mods/tk2.mod") - (screenshot "sshot-geekopeak.rgb") - (topview "topview-geekopeak.rgb") + (music "oggs/tk2.ogg") + (screenshot "sshot-geekopeak.rgb") + (topview "topview-geekopeak.rgb") ) ;; EOF ;; diff --git a/data/gownsbow.track b/data/gownsbow.track index 1f4acc6fa..9d52e4075 100644 --- a/data/gownsbow.track +++ b/data/gownsbow.track @@ -1,12 +1,12 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "Gowns Bow") + (name "Gowns Bow") (description "Created by Oliver & Steve Baker") - (gravity 78.0) - (music "mods/tk5a.mod") - (screenshot "sshot-gownsbow.rgb") - (topview "topview-gownsbow.rgb") + (gravity 78.0) + (music "oggs/tk5a.ogg") + (screenshot "sshot-gownsbow.rgb") + (topview "topview-gownsbow.rgb") ) ;; EOF ;; diff --git a/data/islandtrack.track b/data/islandtrack.track index 7b2b5f0de..6918c76a3 100644 --- a/data/islandtrack.track +++ b/data/islandtrack.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "The Island") + (name "The Island") (description "Created by Johannes Sjolund") - (music "mods/Boom_boom_boom.mod") - (screenshot "sshot-islandtrack.rgb") - (topview "topview-islandtrack.rgb") + (music "oggs/Boom_boom_boom.ogg") + (screenshot "sshot-islandtrack.rgb") + (topview "topview-islandtrack.rgb") (start-heading 0.0 3.7 9.5 11.5 15.1 17.0 20.2 22.0 26.0 36.0 ) (start-x -1.2 1.6 -0.9 2.3 0.0 3.4 1.2 4.2 2.6 6.2 ) (start-y -0.5 -1.5 -3.8 -5.0 -7.0 -8.0 -10.4 -10.9 -13.4 -14.1 ) diff --git a/data/lighthouse.track b/data/lighthouse.track index 7a73ef9d1..2d5502abe 100644 --- a/data/lighthouse.track +++ b/data/lighthouse.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "Around the Lighthouse") + (name "Around the Lighthouse") (description "Created by Ingo Ruhnke") - (music "mods/tk2.mod") - (screenshot "sshot-lighthouse.rgb") - (topview "topview-lighthouse.rgb") + (music "oggs/tk2.ogg") + (screenshot "sshot-lighthouse.rgb") + (topview "topview-lighthouse.rgb") ) ;; EOF ;; diff --git a/data/littlevolcano.track b/data/littlevolcano.track index 918ae784d..d65eeab88 100644 --- a/data/littlevolcano.track +++ b/data/littlevolcano.track @@ -15,9 +15,9 @@ (sun-diffuse 0.8 0.6 0.6 0.0) (sun-specular 1.0 0.8 0.8 0.0) - (music "mods/tk5a.mod") + (music "oggs/tk5a.ogg") (screenshot "sshot-littlevolcano.rgb") - (topview "topview-littlevolcano.rgb") + (topview "topview-littlevolcano.rgb") ) ;; EOF ;; diff --git a/data/olivermath.track b/data/olivermath.track index a4783ed00..a935589c7 100644 --- a/data/olivermath.track +++ b/data/olivermath.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "Oliver's Math Class") + (name "Oliver's Math Class") (description "Created by Oliver & Steve Baker") - (music "mods/Boom_boom_boom.mod") - (screenshot "sshot-olivermath.rgb") - (topview "topview-olivermath.rgb") + (music "oggs/Boom_boom_boom.ogg") + (screenshot "sshot-olivermath.rgb") + (topview "topview-olivermath.rgb") ) ;; EOF ;; diff --git a/data/race.track b/data/race.track index 2a260c753..190b7bd72 100644 --- a/data/race.track +++ b/data/race.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "Race Track") + (name "Race Track") (description "Created by Ingo Ruhnke") - (music "mods/tk5a.mod" "mods/tk2.mod") - (screenshot "sshot-race.rgb") - (topview "topview-race.rgb") + (music "oggs/tk5a.ogg" "oggs/tk2.ogg") + (screenshot "sshot-race.rgb") + (topview "topview-race.rgb") ) ;; EOF ;; diff --git a/data/sandtrack.track b/data/sandtrack.track index 38021ab64..ea13489e4 100644 --- a/data/sandtrack.track +++ b/data/sandtrack.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "Shifting Sands") + (name "Shifting Sands") (description "Created by Oliver & Steve Baker") - (music "mods/tk7.mod") - (screenshot "sshot-sandtrack.rgb") - (topview "topview-sandtrack.rgb") + (music "oggs/tk7.ogg") + (screenshot "sshot-sandtrack.rgb") + (topview "topview-sandtrack.rgb") ) ;; EOF ;; diff --git a/data/subseatrack.track b/data/subseatrack.track index 3b57f7008..d24b47a5a 100644 --- a/data/subseatrack.track +++ b/data/subseatrack.track @@ -15,9 +15,9 @@ (sun-specular 0.8 0.8 1.0 0.0) ;; The default x start coordinates are a bit too far to the right (start-x 2.0 -1.0 2.0 -1.0 2.0 -1.0 2.0 -1.0 2.0 -1.0 ) - (music "mods/tuxr.mod") + (music "oggs/tuxr.ogg") (screenshot "sshot-subseatrack.rgb") - (topview "topview-subseatrack.rgb") + (topview "topview-subseatrack.rgb") ) ;; EOF ;; diff --git a/data/tuxtrack.track b/data/tuxtrack.track index 72c5d94b0..abe7908e5 100644 --- a/data/tuxtrack.track +++ b/data/tuxtrack.track @@ -3,9 +3,9 @@ (tuxkart-track (name "Tux Tollway") (description "Created by Oliver & Steve Baker") - (music "mods/tk2.mod") - (screenshot "sshot-tuxtrack.rgb") - (topview "topview-tuxtrack.rgb") + (music "oggs/tk2.ogg") + (screenshot "sshot-tuxtrack.rgb") + (topview "topview-tuxtrack.rgb") (start-heading -25.0 -25.0 -25.0 -25.0 -25.0 -25.0 -25.0 -25.0 -25.0 -25.0 ) (start-x 0.1 -3.3 -1.5 -4.8 -3.0 -6.3 -4.5 -7.8 -6.0 -9.3 ) (start-y -2.0 -1.8 -4.6 -4.4 -7.2 -7.0 -9.8 -9.6 -12.4 -12.2 ) diff --git a/data/volcano.track b/data/volcano.track index 565dac93b..40c298f4e 100644 --- a/data/volcano.track +++ b/data/volcano.track @@ -1,11 +1,11 @@ ;; -*- mode: lisp -*- (tuxkart-track - (name "Volcano") + (name "Volcano") (description "Created by Ingo Ruhnke") - (music "mods/Boom_boom_boom.mod") - (screenshot "sshot-volcano.rgb") - (topview "topview-volcano.rgb") + (music "oggs/Boom_boom_boom.ogg") + (screenshot "sshot-volcano.rgb") + (topview "topview-volcano.rgb") ) ;; EOF ;; diff --git a/mods/Boom_boom_boom.mod b/mods/Boom_boom_boom.mod deleted file mode 100644 index a68bc4ce7..000000000 Binary files a/mods/Boom_boom_boom.mod and /dev/null differ diff --git a/mods/Makefile.am b/mods/Makefile.am deleted file mode 100644 index 236a37374..000000000 --- a/mods/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# mods/ - -pkgdatadir = $(datadir)/games/@PACKAGE@/mods - -pkgdata_DATA = $(wildcard *.mod) - -EXTRA_DIST = $(pkgdata_DATA) \ No newline at end of file diff --git a/mods/tk2.mod b/mods/tk2.mod deleted file mode 100644 index e764e54ed..000000000 Binary files a/mods/tk2.mod and /dev/null differ diff --git a/mods/tk5a.mod b/mods/tk5a.mod deleted file mode 100644 index 10061ac1a..000000000 Binary files a/mods/tk5a.mod and /dev/null differ diff --git a/mods/tk7.mod b/mods/tk7.mod deleted file mode 100644 index bb4bc7493..000000000 Binary files a/mods/tk7.mod and /dev/null differ diff --git a/mods/tuxr.mod b/mods/tuxr.mod deleted file mode 100644 index 5077a67b8..000000000 Binary files a/mods/tuxr.mod and /dev/null differ diff --git a/oggs/Boom_boom_boom.ogg b/oggs/Boom_boom_boom.ogg new file mode 100755 index 000000000..eed887b23 Binary files /dev/null and b/oggs/Boom_boom_boom.ogg differ diff --git a/oggs/tk2.ogg b/oggs/tk2.ogg new file mode 100755 index 000000000..e29db0b51 Binary files /dev/null and b/oggs/tk2.ogg differ diff --git a/oggs/tk5a.ogg b/oggs/tk5a.ogg new file mode 100755 index 000000000..e4726d89d Binary files /dev/null and b/oggs/tk5a.ogg differ diff --git a/oggs/tk7.ogg b/oggs/tk7.ogg new file mode 100755 index 000000000..4bc2a51a7 Binary files /dev/null and b/oggs/tk7.ogg differ diff --git a/oggs/tuxr.ogg b/oggs/tuxr.ogg new file mode 100755 index 000000000..bc944dfcc Binary files /dev/null and b/oggs/tuxr.ogg differ