diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /scripts/src/tools.lua | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'scripts/src/tools.lua')
-rw-r--r-- | scripts/src/tools.lua | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 4073f9c7336..564653f5a4a 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -499,6 +499,7 @@ links { includedirs { MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/netlist", } files { @@ -543,6 +544,7 @@ links { includedirs { MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/netlist", } files { @@ -741,6 +743,7 @@ files { MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp", MAME_DIR .. "src/tools/imgtool/modules/hp9845_tape.cpp", MAME_DIR .. "src/tools/imgtool/modules/hp85_tape.cpp", + MAME_DIR .. "src/tools/imgtool/modules/rt11.cpp", } configuration { "mingw*" or "vs*" } @@ -791,3 +794,98 @@ if _OPTIONS["targetos"] == "macosx" then strip() end + +-------------------------------------------------- +-- testkeys +-------------------------------------------------- + +if (_OPTIONS["osd"] == "sdl") then + project("testkeys") + uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables + } + + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + links { + "ocore_" .. _OPTIONS["osd"], + ext_lib("utf8proc"), + } + + if _OPTIONS["targetos"]=="windows" then + if _OPTIONS["with-bundled-sdl2"]~=nil then + configuration { "mingw*"} + links { + "SDL2", + "imm32", + "version", + "ole32", + "oleaut32", + } + configuration { "vs*" } + links { + "SDL2", + "imm32", + "version", + } + configuration { } + else + if _OPTIONS["USE_LIBSDL"]~="1" then + configuration { "mingw*"} + links { + "SDL2main", + "SDL2", + } + configuration { "vs*" } + links { + "SDL2", + "imm32", + "version", + } + configuration { } + else + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) + end + configuration { "x32", "vs*" } + libdirs { + path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86") + } + configuration { "x64", "vs*" } + libdirs { + path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") + } + end + end + + if BASE_TARGETOS=="unix" then + if _OPTIONS["with-bundled-sdl2"]~=nil then + links { + "SDL2", + } + end + end + + dofile("osd/sdl_cfg.lua") + + includedirs { + MAME_DIR .. "src/osd", + } + + files { + MAME_DIR .. "src/tools/testkeys.cpp", + } + + configuration { "mingw*" or "vs*" } + targetextension ".exe" + + configuration { } + + strip() +end |