ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[EMSCRIPTEN] enable openal, change library name to retro_emscripten

This commit is contained in:
ToadKing 2013-07-27 14:17:22 -04:00
parent 9816334ef4
commit 6bb403c04b
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.emscripten
View File

@ -39,6 +39,7 @@ OBJ = frontend/frontend_emscripten.o \
performance.o performance.o
HAVE_OPENGL = 1 HAVE_OPENGL = 1
HAVE_AL = 1
HAVE_RGUI = 1 HAVE_RGUI = 1
HAVE_SDL = 1 HAVE_SDL = 1
HAVE_SDL_IMAGE = 1 HAVE_SDL_IMAGE = 1
@ -47,10 +48,14 @@ HAVE_ZLIB = 1
HAVE_FBO = 1 HAVE_FBO = 1
WANT_MINIZ = 1 WANT_MINIZ = 1
libretro ?= -lretro ifneq ($(NATIVE_ZLIB),)
WANT_MINIZ = 0
endif
libretro ?= -lretro_emscripten
LIBS = -lm 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 LDFLAGS = -L. -static-libgcc -s TOTAL_MEMORY=268435456 -s FULL_ES2=1
ifeq ($(SCALER_NO_SIMD), 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 DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL
endif endif
ifeq ($(HAVE_AL), 1)
OBJ += audio/openal.o
DEFINES += -DHAVE_AL
LIBS += -lopenal
endif
ifeq ($(HAVE_ZLIB), 1) ifeq ($(HAVE_ZLIB), 1)
OBJ += gfx/rpng/rpng.o file_extract.o OBJ += gfx/rpng/rpng.o file_extract.o
DEFINES += -DHAVE_ZLIB DEFINES += -DHAVE_ZLIB
@ -105,7 +116,7 @@ ifneq ($(V), 1)
endif endif
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
LDFLAGS += -O0 -g -s LABEL_DEBUG=1 LDFLAGS += -O0 -g
else else
LDFLAGS += -O2 -ffast-math LDFLAGS += -O2 -ffast-math
endif endif

2
config.def.h
View File

@ -129,8 +129,6 @@ enum
#define AUDIO_DEFAULT_DRIVER AUDIO_SL #define AUDIO_DEFAULT_DRIVER AUDIO_SL
#elif defined(HAVE_DSOUND) #elif defined(HAVE_DSOUND)
#define AUDIO_DEFAULT_DRIVER AUDIO_DSOUND #define AUDIO_DEFAULT_DRIVER AUDIO_DSOUND
#elif defined(EMSCRIPTEN)
#define AUDIO_DEFAULT_DRIVER AUDIO_NULL
#elif defined(HAVE_SDL) #elif defined(HAVE_SDL)
#define AUDIO_DEFAULT_DRIVER AUDIO_SDL #define AUDIO_DEFAULT_DRIVER AUDIO_SDL
#elif defined(HAVE_XAUDIO) #elif defined(HAVE_XAUDIO)

8
libretro-test/Makefile
View File

@ -1,4 +1,8 @@
ifneq ($(EMSCRIPTEN),)
platform = emscripten
endif
ifeq ($(platform),) ifeq ($(platform),)
platform = unix platform = unix
ifeq ($(shell uname -a),) ifeq ($(shell uname -a),)
@ -32,6 +36,10 @@ else ifeq ($(platform), qnx)
TARGET := $(TARGET_NAME)_libretro_qnx.so TARGET := $(TARGET_NAME)_libretro_qnx.so
fpic := -fPIC fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined 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 else
CC = gcc CC = gcc
TARGET := $(TARGET_NAME)_retro.dll TARGET := $(TARGET_NAME)_retro.dll