Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-03 03:16:30 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

attempt to fix testkeys linking in more configurations (nw)

Browse Source
This commit is contained in:
Vas Crabb 2019-02-18 14:26:10 +11:00
parent 058f7c0ae3
commit 176ba64b26
2 changed files with 83 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/src/osd/sdl.lua
View File

@ -91,11 +91,11 @@ function maintargetosdoptions(_target,_subtarget)
libdirs {
path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
}
configuration { }
end
links {
"psapi",
}
configuration {}
elseif _OPTIONS["targetos"]=="haiku" then
links {
"network",

118
scripts/src/tools.lua
View File

@ -797,46 +797,92 @@ end
--------------------------------------------------
if (_OPTIONS["osd"] == "sdl") then
project("testkeys")
uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d")
kind "ConsoleApp"
project("testkeys")
uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d")
kind "ConsoleApp"
flags {
"Symbols", -- always include minimum symbols for executables
}
flags {
"Symbols", -- always include minimum symbols for executables
}
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
if _OPTIONS["targetos"] == "macosx" then
links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("utf8proc"),
}
else
links {
"SDL2",
"SDL2main",
"ocore_" .. _OPTIONS["osd"],
ext_lib("utf8proc"),
}
end
dofile("osd/sdl_cfg.lua")
links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("utf8proc"),
}
includedirs {
MAME_DIR .. "src/osd",
}
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",
}
files {
MAME_DIR .. "src/tools/testkeys.cpp",
}
configuration { "mingw*" or "vs*" }
targetextension ".exe"
configuration { }
strip()
configuration { "mingw*" or "vs*" }
targetextension ".exe"
configuration { }
strip()
end