mirror of
https://github.com/libretro/RetroArch
synced 2025-03-17 10:21:26 +00:00
Merge pull request #9258 from ToadKing/emscripten-fix
emscripten: Fix GLSL not being built in
This commit is contained in:
commit
708a87247d
@ -7,9 +7,10 @@ PTHREAD = 0
|
||||
OS = Emscripten
|
||||
OBJ :=
|
||||
DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
|
||||
DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN -DHAVE_STB_FONT
|
||||
DEFINES += -DHAVE_FILTERS_BUILTIN
|
||||
|
||||
HAVE_OVERLAY = 1
|
||||
HAVE_GLSL = 1
|
||||
HAVE_AUDIOMIXER = 1
|
||||
HAVE_VIDEO_LAYOUT = 0
|
||||
HAVE_CC_RESAMPLER = 1
|
||||
@ -27,9 +28,10 @@ HAVE_ZLIB = 1
|
||||
HAVE_SHADERPIPELINE = 1
|
||||
HAVE_STATIC_VIDEO_FILTERS = 1
|
||||
HAVE_STATIC_AUDIO_FILTERS = 1
|
||||
MEMORY = 536870912
|
||||
HAVE_STB_FONT = 1
|
||||
|
||||
MEMORY = 536870912
|
||||
|
||||
PRECISE_F32 = 1
|
||||
|
||||
OBJDIR := obj-emscripten
|
||||
@ -37,7 +39,7 @@ OBJDIR := obj-emscripten
|
||||
#if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS:
|
||||
|
||||
LIBS := -s USE_ZLIB=1
|
||||
LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 -s BINARYEN_TRAP_MODE=\"clamp\" \
|
||||
LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 \
|
||||
-s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
|
||||
--js-library emscripten/library_rwebaudio.js \
|
||||
--js-library emscripten/library_rwebcam.js
|
||||
|
@ -64,9 +64,10 @@ static EM_BOOL rwebpad_gamepad_cb(int event_type,
|
||||
|
||||
static bool rwebpad_joypad_init(void *data)
|
||||
{
|
||||
int supported = emscripten_get_num_gamepads();
|
||||
EMSCRIPTEN_RESULT supported;
|
||||
(void)data;
|
||||
|
||||
supported = emscripten_sample_gamepad_data();
|
||||
if (supported == EMSCRIPTEN_RESULT_NOT_SUPPORTED)
|
||||
return false;
|
||||
|
||||
@ -171,8 +172,7 @@ static int16_t rwebpad_joypad_axis(unsigned port_num, uint32_t joyaxis)
|
||||
|
||||
static void rwebpad_joypad_poll(void)
|
||||
{
|
||||
/* this call makes emscripten poll gamepad state */
|
||||
(void)emscripten_get_num_gamepads();
|
||||
(void)emscripten_sample_gamepad_data();
|
||||
}
|
||||
|
||||
static bool rwebpad_joypad_query_pad(unsigned pad)
|
||||
|
Loading…
x
Reference in New Issue
Block a user