diff options
author | 2016-03-29 08:49:47 +0200 | |
---|---|---|
committer | 2016-03-29 08:49:47 +0200 | |
commit | 9b3788035cbd3a037c76378ffb09b486af4d28c6 (patch) | |
tree | 86eb0ed78640e49a9af126b863bd4d2bc78248b5 /scripts/src/osd/sdl.lua | |
parent | 3fb7f61cfceb8789a680b7ca9ec8fee0e0bff7a0 (diff) |
scrclean on lua scripts (nw)
Diffstat (limited to 'scripts/src/osd/sdl.lua')
-rw-r--r-- | scripts/src/osd/sdl.lua | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 03e82ffcb2f..f1d307b8cab 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -89,7 +89,7 @@ function maintargetosdoptions(_target,_subtarget) configuration { "x64", "vs*" } libdirs { path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") - } + } end links { "psapi", @@ -116,15 +116,15 @@ function maintargetosdoptions(_target,_subtarget) "psapi" } configuration { } - - if _OPTIONS["targetos"]=="macosx" then + + if _OPTIONS["targetos"]=="macosx" then if _OPTIONS["with-bundled-sdl2"]~=nil then links { "SDL2", } - end - end - + end + end + end @@ -145,8 +145,8 @@ newoption { } newoption { - trigger = "SDL_INI_PATH", - description = "Default search path for .ini files", + trigger = "SDL_INI_PATH", + description = "Default search path for .ini files", } newoption { @@ -255,22 +255,22 @@ if BASE_TARGETOS=="unix" then "-framework QuartzCore", "-framework OpenGL", } - - + + if os_version>=101100 then linkoptions { "-weak_framework Metal", } end if _OPTIONS["with-bundled-sdl2"]~=nil then - linkoptions { - "-framework AudioUnit", - "-framework CoreAudio", - "-framework Carbon", - "-framework ForceFeedback", - "-framework IOKit", - "-framework CoreVideo", - } + linkoptions { + "-framework AudioUnit", + "-framework CoreAudio", + "-framework Carbon", + "-framework ForceFeedback", + "-framework IOKit", + "-framework CoreVideo", + } else if _OPTIONS["USE_LIBSDL"]~="1" then linkoptions { @@ -303,8 +303,8 @@ if BASE_TARGETOS=="unix" then local str = backtick(sdlconfigcmd() .. " --libs") addlibfromstring(str) addoptionsfromstring(str) - end - + end + if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then links { "m", |