diff options
author | 2023-02-26 19:40:37 +0100 | |
---|---|---|
committer | 2023-02-27 05:40:37 +1100 | |
commit | bd59a0d447b861982429905f186dee8b12f2e777 (patch) | |
tree | dc6341c8fb098818039127f758cf3eb0fade986a /scripts/src/tools.lua | |
parent | 28b03e92a84daf79eb3cef75c51c014b2f57807b (diff) |
Removed local copy of SDL source and update Android build support. (#10899)
* Removed SDL2 source.
* Updated gradle.
* Updated SDL2 Java support glue code.
* Increased minimum supported Android API version to 24.
* Updated required asset files for Android app.
* Added proper tag for Android logging.
* Added SDL2 hint to make BGFX work on Android.
Diffstat (limited to 'scripts/src/tools.lua')
-rw-r--r-- | scripts/src/tools.lua | 50 |
1 files changed, 12 insertions, 38 deletions
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index b6c09e3f8ef..6b30fc951c0 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -782,14 +782,11 @@ if (_OPTIONS["osd"] == "sdl") then } if _OPTIONS["targetos"]=="windows" then - if _OPTIONS["with-bundled-sdl2"]~=nil then + if _OPTIONS["USE_LIBSDL"]~="1" then configuration { "mingw*"} links { + "SDL2main", "SDL2", - "imm32", - "version", - "ole32", - "oleaut32", } configuration { "vs*" } links { @@ -799,41 +796,18 @@ if (_OPTIONS["osd"] == "sdl") then } configuration { } else - if _OPTIONS["USE_LIBSDL"]~="1" then - configuration { "mingw*"} - links { - "SDL2main", - "SDL2", - } - configuration { "vs*" } - links { - "SDL2", - "imm32", - "version", - } - configuration { } - else - local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") - addlibfromstring(str) - addoptionsfromstring(str) - end - configuration { "x32", "vs*" } - libdirs { - path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86") - } - configuration { "x64", "vs*" } - libdirs { - path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") - } + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) end - end - - if BASE_TARGETOS=="unix" then - if _OPTIONS["with-bundled-sdl2"]~=nil then - links { - "SDL2", + configuration { "x32", "vs*" } + libdirs { + path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86") + } + configuration { "x64", "vs*" } + libdirs { + path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") } - end end dofile("osd/sdl_cfg.lua") |