trunk/scripts/src/main.lua
r253647 | r253648 | |
284 | 284 | "@echo Emitting ".. rctarget .. "vers.rc...", |
285 | 285 | PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") , |
286 | 286 | } |
| 287 | |
| 288 | if (_OPTIONS["osd"] == "sdl") then |
| 289 | configuration { "x64","vs*" } |
| 290 | prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x64/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" } |
| 291 | configuration { "x32","vs*" } |
| 292 | prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x86/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" } |
| 293 | end |
287 | 294 | |
288 | | |
289 | 295 | configuration { } |
290 | 296 | |
291 | 297 | debugdir (MAME_DIR) |
trunk/scripts/src/osd/sdl.lua
r253647 | r253648 | |
49 | 49 | |
50 | 50 | if _OPTIONS["targetos"]=="windows" then |
51 | 51 | if _OPTIONS["USE_LIBSDL"]~="1" then |
52 | | links { |
53 | | "SDL2.dll", |
54 | | } |
| 52 | configuration { "mingw*"} |
| 53 | links { |
| 54 | "SDL2.dll", |
| 55 | } |
| 56 | configuration { "x64","vs*" } |
| 57 | libdirs { |
| 58 | MAME_DIR .. "3rdparty/sdl2/lib/x64", |
| 59 | } |
| 60 | configuration { "x32","vs*" } |
| 61 | libdirs { |
| 62 | MAME_DIR .. "3rdparty/sdl2/lib/x86", |
| 63 | } |
| 64 | |
| 65 | configuration { "vs*"} |
| 66 | links { |
| 67 | "SDL2", |
| 68 | } |
| 69 | configuration { } |
55 | 70 | else |
56 | 71 | local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") |
57 | 72 | addlibfromstring(str) |
r253647 | r253648 | |
488 | 503 | |
489 | 504 | if _OPTIONS["targetos"] == "windows" then |
490 | 505 | if _OPTIONS["USE_LIBSDL"]~="1" then |
491 | | links { |
492 | | "SDL2.dll", |
493 | | } |
| 506 | configuration { "mingw*"} |
| 507 | links { |
| 508 | "SDL2.dll", |
| 509 | } |
| 510 | configuration { "x64","vs*" } |
| 511 | libdirs { |
| 512 | MAME_DIR .. "3rdparty/sdl2/lib/x64", |
| 513 | } |
| 514 | configuration { "x32","vs*" } |
| 515 | libdirs { |
| 516 | MAME_DIR .. "3rdparty/sdl2/lib/x86", |
| 517 | } |
| 518 | configuration { "vs*"} |
| 519 | links { |
| 520 | "SDL2", |
| 521 | } |
| 522 | configuration { } |
494 | 523 | else |
495 | 524 | local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") |
496 | 525 | addlibfromstring(str) |