Index: addons/audio/openal.c
===================================================================
--- addons/audio/openal.c	(revision 10172)
+++ addons/audio/openal.c	(working copy)
@@ -8,20 +8,13 @@
 
 #include <AL/al.h>
 #include <AL/alc.h>
-#include <AL/alext.h>
+//#include <AL/alext.h>
 
 #include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_thread.h"
 #include "allegro5/internal/aintern_audio.h"
 
-#ifndef ALLEGRO_FORMAT_QUAD8_LOKI
-#define ALLEGRO_FORMAT_QUAD8_LOKI 0x10004
-#endif
-#ifndef ALLEGRO_FORMAT_QUAD16_LOKI
-#define ALLEGRO_FORMAT_QUAD16_LOKI 0x10005
-#endif
-
 /* OpenAL vars */
 ALCdevice*  openal_dev;
 ALCcontext* openal_context;
@@ -212,8 +205,7 @@
 
 
    silence = calloc(1, ex_data->buffer_size);
-   if(ex_data->format == AL_FORMAT_QUAD8_LOKI ||
-      ex_data->format == AL_FORMAT_STEREO8 ||
+   if(ex_data->format == AL_FORMAT_STEREO8 ||
       ex_data->format == AL_FORMAT_MONO8)
       memset(silence, 0x80, ex_data->buffer_size);
 
@@ -227,9 +219,7 @@
    alSourcePlay(ex_data->source);
 
    samples_per_update = ex_data->buffer_size /
-                        ((ex_data->format==AL_FORMAT_QUAD16_LOKI) ? 8 :
-                         (ex_data->format==AL_FORMAT_QUAD8_LOKI ||
-                          ex_data->format==AL_FORMAT_STEREO16) ? 4 :
+                        ((ex_data->format==AL_FORMAT_STEREO16) ? 4 :
                           ((ex_data->format==AL_FORMAT_STEREO8 ||
                             ex_data->format==AL_FORMAT_MONO16) ? 2 : 1));
 
@@ -389,9 +379,7 @@
       ex_data->buffer_size = voice->buffer_size;
       if(!ex_data->buffer_size)
          ex_data->buffer_size = preferred_frag_size *
-                          ((ex_data->format==AL_FORMAT_QUAD16_LOKI) ? 8 :
-                           (ex_data->format==AL_FORMAT_QUAD8_LOKI ||
-                            ex_data->format==AL_FORMAT_STEREO16) ? 4 :
+                          ((ex_data->format==AL_FORMAT_STEREO16) ? 4 :
                             ((ex_data->format==AL_FORMAT_STEREO8 ||
                               ex_data->format==AL_FORMAT_MONO16) ? 2 : 1));
       ex_data->num_buffers = voice->num_buffers;
@@ -518,8 +506,7 @@
 
    if(voice->chan_conf != ALLEGRO_AUDIO_1_CH && voice->chan_conf != ALLEGRO_AUDIO_2_CH)
    {
-      if(voice->chan_conf != ALLEGRO_AUDIO_4_CH ||
-         !alIsExtensionPresent("AL_LOKI_quadriphonic"))
+      if(voice->chan_conf != ALLEGRO_AUDIO_4_CH)
       {
          if((voice->settings&ALLEGRO_AUDIO_REQUIRE))
             return 1;
@@ -545,13 +532,6 @@
       else
          ex_data->format = AL_FORMAT_STEREO16;
    }
-   else
-   {
-      if(voice->depth == ALLEGRO_AUDIO_8_BIT_UINT)
-         ex_data->format = AL_FORMAT_QUAD8_LOKI;
-      else
-         ex_data->format = AL_FORMAT_QUAD16_LOKI;
-   }
 
    ex_data->stop_voice = 1;
    voice->extra = ex_data;
Index: addons/audio/CMakeLists.txt
===================================================================
--- addons/audio/CMakeLists.txt	(revision 10172)
+++ addons/audio/CMakeLists.txt	(working copy)
@@ -6,7 +6,7 @@
     set(AUDIO_LIBRARIES openal asound)
 else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(AUDIO_SOURCES audio.c openal.c)
-    set(AUDIO_LIBRARIES openal)
+    set(AUDIO_LIBRARIES openal32)
 endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
 set(AUDIO_INCLUDE_FILES allegro5/audio.h)