From 5c482945c69e870e41643a5ab7473fc0cf60035c Mon Sep 17 00:00:00 2001 From: 68bit Date: Thu, 29 Aug 2019 00:06:37 +1000 Subject: asmjs: avoid explicitly linking SDL2_ttf. It appears that it is sufficient to include `-s USE_SDL_TTF=2`, and emcc links in the SDL2_tff library, and it does not like attempts to link this twice. --- scripts/src/osd/sdl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/src/osd/sdl.lua') diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 75f4416a7f8..ed660e65f9b 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -38,7 +38,7 @@ function maintargetosdoptions(_target,_subtarget) } end - if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" and _OPTIONS["targetos"]~="android" then + if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" and _OPTIONS["targetos"]~="android" and _OPTIONS["targetos"]~="asmjs" then links { "SDL2_ttf", } -- cgit v1.2.3-70-g09d2