diff options
author | 2015-03-28 06:57:07 +0100 | |
---|---|---|
committer | 2015-03-28 06:57:07 +0100 | |
commit | cf02c07fdabff8d685d0ba2ed7966ad6056ab1df (patch) | |
tree | db94db813fa4949b590dba4abdea5242bfab5020 /scripts/src/osd | |
parent | ae98425a87c0950fd744331b26d4fbed86415256 (diff) | |
parent | 523b36f8bd3e32a5bcbf7038e41777145f1b9bdc (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'scripts/src/osd')
-rw-r--r-- | scripts/src/osd/osdmini.lua | 7 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 22 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 13 |
3 files changed, 42 insertions, 0 deletions
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index c3db9d211c6..cd51f8cf1e6 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -1,3 +1,10 @@ +function includeosd() + includedirs { + MAME_DIR .. "src/osd", + } +end + + project ("osd_" .. _OPTIONS["osd"]) uuid (os.uuid("osd_" .. _OPTIONS["osd"])) kind "StaticLib" diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index fb7eae99383..ff49229d470 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -1,3 +1,25 @@ +function includeosd() + includedirs { + MAME_DIR .. "src/osd", + MAME_DIR .. "src/osd/sdl", + } +end + + +forcedincludes { + MAME_DIR .. "src/osd/sdl/sdlprefix.h" +} + + +configuration { "mingw*" } + linkoptions { + "-Wl,--allow-multiple-definition", + "-static" + } + +configuration { } + + project ("osd_" .. _OPTIONS["osd"]) uuid (os.uuid("osd_" .. _OPTIONS["osd"])) kind "StaticLib" diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 1cc64c2eae9..9a786632f6a 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -1,3 +1,16 @@ +function includeosd() + includedirs { + MAME_DIR .. "src/osd", + MAME_DIR .. "src/osd/windows", + } +end + + +forcedincludes { + MAME_DIR .. "src/osd/windows/winprefix.h" +} + + project ("osd_" .. _OPTIONS["osd"]) uuid (os.uuid("osd_" .. _OPTIONS["osd"])) kind "StaticLib" |