diff options
author | 2015-04-04 18:25:04 +1100 | |
---|---|---|
committer | 2015-04-04 18:25:04 +1100 | |
commit | 73f53bb15e363712d097fe59c097de1a1fb9fed0 (patch) | |
tree | 70b159e73ec28ed30fc6635c0df79007318ac031 /scripts/src/osd | |
parent | 3a15dfc2d89ca7d42748ced4582e69e6556c61cd (diff) |
* Take more link dependencies caused by OSD out of genie.lua
* Always dynamically link SDL on Windows
* Fix SDL1 build on Windows
Diffstat (limited to 'scripts/src/osd')
-rw-r--r-- | scripts/src/osd/modules.lua | 8 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 30 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 5 |
3 files changed, 32 insertions, 11 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index c8e1efee2c9..eac621aaf8b 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -181,6 +181,14 @@ function osdmodulestargetconf() end end + if _OPTIONS["targetos"]=="windows" then + links { + "gdi32", + "dsound", + "dxguid", + } + end + end diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 551b98cb392..578fb17608f 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -43,6 +43,16 @@ function maintargetosdoptions(_target) end if _OPTIONS["targetos"]=="windows" then + if _OPTIONS["SDL_LIBVER"]=="sdl2" then + links { + "SDL2.dll", + } + else + links { + "SDL.dll", + } + end + configuration { "mingw*" } linkoptions{ "-municode", @@ -59,10 +69,6 @@ function maintargetosdoptions(_target) libdirs { path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") } - configuration { "vs*" } - links { - "SDL2", - } configuration {} elseif _OPTIONS["targetos"]=="haiku" then links { @@ -282,13 +288,6 @@ elseif BASE_TARGETOS=="os2" then } end -configuration { "mingw*" } - linkoptions { - "-static" - } - -configuration { } - project ("osd_" .. _OPTIONS["osd"]) uuid (os.uuid("osd_" .. _OPTIONS["osd"])) @@ -442,6 +441,15 @@ if _OPTIONS["with-tools"] then } if _OPTIONS["targetos"]=="windows" then + if _OPTIONS["SDL_LIBVER"]=="sdl2" then + links { + "SDL2.dll", + } + else + links { + "SDL.dll", + } + end linkoptions{ "-municode", } diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 3b060f64b55..bdfb2eb57f9 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -28,6 +28,11 @@ function maintargetosdoptions(_target) } end + links { + "comctl32", + "comdlg32", + } + local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc" if os.isfile(rcfile) then |