diff options
author | 2015-04-04 14:44:22 +0200 | |
---|---|---|
committer | 2015-04-04 14:44:22 +0200 | |
commit | 6f0fd1a366cbb3cd919f66b13598c575e39edd6f (patch) | |
tree | 32cbc8b761db44feb3f0c8eb9030e40583e69548 /scripts/genie.lua | |
parent | 1026d09afa7583f0a296ac88b90ca419ebf405ec (diff) | |
parent | 73f53bb15e363712d097fe59c097de1a1fb9fed0 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r-- | scripts/genie.lua | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 9764bd88219..0673238a681 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -56,7 +56,7 @@ newoption { newoption { trigger = "osd", - description = "Choose target OSD", + description = "Choose OSD layer implementation", } newoption { @@ -68,14 +68,17 @@ newoption { { "android-x86", "Android - x86" }, { "asmjs", "Emscripten/asm.js" }, { "freebsd", "FreeBSD" }, + { "netbsd", "NetBSD" }, + { "openbsd", "OpenBSD" }, { "nacl", "Native Client" }, { "nacl-arm", "Native Client - ARM" }, { "pnacl", "Native Client - PNaCl" }, - { "linux", "Linux" }, - { "ios", "iOS" }, + { "linux", "Linux" }, + { "ios", "iOS" }, { "macosx", "OSX" }, { "windows", "Windows" }, - + { "os2", "OS/2 eComStation" }, + { "haiku", "Haiku" }, }, } @@ -783,26 +786,12 @@ configuration { "mingw*" } "-static-libgcc", "-static-libstdc++", } -if _OPTIONS["osd"]=="sdl" then - links { - "SDL2", - "imm32", - "version", - "ole32", - "oleaut32", - } -end links { "user32", - "gdi32", - "dsound", - "dxguid", "winmm", "advapi32", - "comctl32", "shlwapi", "wsock32", - "comdlg32", } configuration { "vs*" } @@ -815,15 +804,10 @@ configuration { "vs*" } } links { "user32", - "gdi32", - "dsound", - "dxguid", "winmm", "advapi32", - "comctl32", "shlwapi", "wsock32", - "comdlg32", } buildoptions { |