summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/tools.lua
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/tools.lua
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/tools.lua')
-rw-r--r--scripts/src/tools.lua98
1 files changed, 0 insertions, 98 deletions
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 564653f5a4a..4073f9c7336 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -499,7 +499,6 @@ links {
includedirs {
MAME_DIR .. "src/lib",
- MAME_DIR .. "src/lib/netlist",
}
files {
@@ -544,7 +543,6 @@ links {
includedirs {
MAME_DIR .. "src/lib",
- MAME_DIR .. "src/lib/netlist",
}
files {
@@ -743,7 +741,6 @@ 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*" }
@@ -794,98 +791,3 @@ 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