summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd/sdl.lua
diff options
context:
space:
mode:
author 68bit <info@68bit.org>2019-08-29 00:06:37 +1000
committer Justin Kerk <dopefishjustin@gmail.com>2019-08-28 14:25:27 +0000
commit5c482945c69e870e41643a5ab7473fc0cf60035c (patch)
treea59ef6a5822ea06ff7219e21d4b5ad9c050397f9 /scripts/src/osd/sdl.lua
parent6d76d3f8f86fa42b58e6d24839c1f05adc7286e4 (diff)
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.
Diffstat (limited to 'scripts/src/osd/sdl.lua')
-rw-r--r--scripts/src/osd/sdl.lua2
1 files changed, 1 insertions, 1 deletions
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",
}