From 6bb403c04b47e816df66287d29b06a687f419477 Mon Sep 17 00:00:00 2001
From: ToadKing <toadking@toadking.com>
Date: Sat, 27 Jul 2013 14:17:22 -0400
Subject: [PATCH] [EMSCRIPTEN] enable openal, change library name to
 retro_emscripten

---
 Makefile.emscripten    | 17 ++++++++++++++---
 config.def.h           |  2 --
 libretro-test/Makefile |  8 ++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Makefile.emscripten b/Makefile.emscripten
index c7e5612320..797e62c0b2 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -39,6 +39,7 @@ OBJ = frontend/frontend_emscripten.o \
 		performance.o
 
 HAVE_OPENGL = 1
+HAVE_AL = 1
 HAVE_RGUI = 1
 HAVE_SDL = 1
 HAVE_SDL_IMAGE = 1
@@ -47,10 +48,14 @@ HAVE_ZLIB = 1
 HAVE_FBO = 1
 WANT_MINIZ = 1
 
-libretro ?= -lretro
+ifneq ($(NATIVE_ZLIB),)
+   WANT_MINIZ = 0
+endif
+
+libretro ?= -lretro_emscripten
 
 LIBS = -lm
-DEFINES = -I. -DHAVE_SCREENSHOTS -DHAVE_NULLAUDIO -DHAVE_BSV_MOVIE -DPACKAGE_VERSION=\"0.9.9.3\"
+DEFINES = -DHAVE_SCREENSHOTS -DHAVE_NULLAUDIO -DHAVE_BSV_MOVIE -DPACKAGE_VERSION=\"0.9.9.3\"
 LDFLAGS = -L. -static-libgcc -s TOTAL_MEMORY=268435456 -s FULL_ES2=1
 
 ifeq ($(SCALER_NO_SIMD), 1)
@@ -82,6 +87,12 @@ ifeq ($(HAVE_OPENGL), 1)
    DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL
 endif
 
+ifeq ($(HAVE_AL), 1)
+   OBJ += audio/openal.o
+   DEFINES += -DHAVE_AL
+   LIBS += -lopenal
+endif
+
 ifeq ($(HAVE_ZLIB), 1)
    OBJ += gfx/rpng/rpng.o file_extract.o
    DEFINES += -DHAVE_ZLIB
@@ -105,7 +116,7 @@ ifneq ($(V), 1)
 endif
 
 ifeq ($(DEBUG), 1)
-   LDFLAGS += -O0 -g -s LABEL_DEBUG=1
+   LDFLAGS += -O0 -g
 else
    LDFLAGS += -O2 -ffast-math
 endif
diff --git a/config.def.h b/config.def.h
index 8ec9b8d81d..0d647ad290 100644
--- a/config.def.h
+++ b/config.def.h
@@ -129,8 +129,6 @@ enum
 #define AUDIO_DEFAULT_DRIVER AUDIO_SL
 #elif defined(HAVE_DSOUND)
 #define AUDIO_DEFAULT_DRIVER AUDIO_DSOUND
-#elif defined(EMSCRIPTEN)
-#define AUDIO_DEFAULT_DRIVER AUDIO_NULL
 #elif defined(HAVE_SDL)
 #define AUDIO_DEFAULT_DRIVER AUDIO_SDL
 #elif defined(HAVE_XAUDIO)
diff --git a/libretro-test/Makefile b/libretro-test/Makefile
index 15853aaeeb..1998f05f22 100644
--- a/libretro-test/Makefile
+++ b/libretro-test/Makefile
@@ -1,4 +1,8 @@
 
+ifneq ($(EMSCRIPTEN),)
+   platform = emscripten
+endif
+
 ifeq ($(platform),)
 platform = unix
 ifeq ($(shell uname -a),)
@@ -32,6 +36,10 @@ else ifeq ($(platform), qnx)
 	TARGET := $(TARGET_NAME)_libretro_qnx.so
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else ifeq ($(platform), emscripten)
+   TARGET := $(TARGET_NAME)_libretro_emscripten.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
 else
    CC = gcc
    TARGET := $(TARGET_NAME)_retro.dll