summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src/osd')
-rw-r--r--scripts/src/osd/sdl.lua41
-rw-r--r--scripts/src/osd/sdl_cfg.lua2
2 files changed, 36 insertions, 7 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index cb5bd6debdc..76947ad777a 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -49,9 +49,24 @@ function maintargetosdoptions(_target,_subtarget)
if _OPTIONS["targetos"]=="windows" then
if _OPTIONS["USE_LIBSDL"]~="1" then
- links {
- "SDL2.dll",
- }
+ configuration { "mingw*"}
+ links {
+ "SDL2.dll",
+ }
+ configuration { "x64","vs*" }
+ libdirs {
+ MAME_DIR .. "3rdparty/sdl2/lib/x64",
+ }
+ configuration { "x32","vs*" }
+ libdirs {
+ MAME_DIR .. "3rdparty/sdl2/lib/x86",
+ }
+
+ configuration { "vs*"}
+ links {
+ "SDL2",
+ }
+ configuration { }
else
local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
addlibfromstring(str)
@@ -488,9 +503,23 @@ if _OPTIONS["with-tools"] then
if _OPTIONS["targetos"] == "windows" then
if _OPTIONS["USE_LIBSDL"]~="1" then
- links {
- "SDL2.dll",
- }
+ configuration { "mingw*"}
+ links {
+ "SDL2.dll",
+ }
+ configuration { "x64","vs*" }
+ libdirs {
+ MAME_DIR .. "3rdparty/sdl2/lib/x64",
+ }
+ configuration { "x32","vs*" }
+ libdirs {
+ MAME_DIR .. "3rdparty/sdl2/lib/x86",
+ }
+ configuration { "vs*"}
+ links {
+ "SDL2",
+ }
+ configuration { }
else
local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
addlibfromstring(str)
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index bdeb7274ef1..e3a6f913e75 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -113,7 +113,7 @@ if _OPTIONS["targetos"]=="windows" then
}
configuration { "vs*" }
includedirs {
- path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include")
+ MAME_DIR .. "3rdparty/sdl2/include",
}
configuration { }