diff options
Diffstat (limited to 'scripts/src/tools.lua')
-rw-r--r-- | scripts/src/tools.lua | 152 |
1 files changed, 50 insertions, 102 deletions
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index aa966e7763b..e2340724e0c 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -31,6 +31,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("utf8proc"), } @@ -72,6 +73,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -160,6 +162,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -205,6 +208,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -251,6 +255,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -356,46 +361,6 @@ configuration { } strip() -------------------------------------------------- --- src2html --------------------------------------------------- - -project("src2html") -uuid ("b31e963a-09ef-4696-acbd-e663e35ce6f7") -kind "ConsoleApp" - -flags { - "Symbols", -- always include minimum symbols for executables -} - -if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) -end - -links { - "utils", - ext_lib("expat"), - "ocore_" .. _OPTIONS["osd"], - ext_lib("zlib"), - ext_lib("utf8proc"), -} - -includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", -} - -files { - MAME_DIR .. "src/tools/src2html.cpp", -} - -configuration { "mingw*" or "vs*" } - targetextension ".exe" - -configuration { } - -strip() - --------------------------------------------------- -- split -------------------------------------------------- @@ -417,6 +382,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -499,7 +465,11 @@ links { includedirs { MAME_DIR .. "src/lib", - MAME_DIR .. "src/lib/netlist", + MAME_DIR .. "src/lib/netlist", +} + +defines { + "NL_DISABLE_DYNAMIC_LOAD=1", } files { @@ -507,13 +477,13 @@ files { } configuration { "mingw*" } - linkoptions{ - "-municode", - } + linkoptions{ + "-municode", + } configuration { "vs*" } - flags { - "Unicode", - } + flags { + "Unicode", + } configuration { "mingw*" or "vs*" } targetextension ".exe" @@ -544,7 +514,7 @@ links { includedirs { MAME_DIR .. "src/lib", - MAME_DIR .. "src/lib/netlist", + MAME_DIR .. "src/lib/netlist", } files { @@ -552,13 +522,13 @@ files { } configuration { "mingw*" } - linkoptions{ - "-municode", - } + linkoptions{ + "-municode", + } configuration { "vs*" } - flags { - "Unicode", - } + flags { + "Unicode", + } configuration { "mingw*" or "vs*" } targetextension ".exe" @@ -590,6 +560,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -629,12 +600,12 @@ end links { "formats", - "emu", "utils", ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -646,7 +617,10 @@ includedirs { } files { + MAME_DIR .. "src/tools/image_handler.cpp", + MAME_DIR .. "src/tools/image_handler.h", MAME_DIR .. "src/tools/floptool.cpp", + GEN_DIR .. "version.cpp", } configuration { "mingw*" or "vs*" } @@ -674,12 +648,12 @@ end links { "formats", - "emu", "utils", ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -715,15 +689,16 @@ files { MAME_DIR .. "src/tools/imgtool/imghd.h", MAME_DIR .. "src/tools/imgtool/charconv.cpp", MAME_DIR .. "src/tools/imgtool/charconv.h", - MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp", - MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.cpp", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.h", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.cpp", + MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.h", MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp", - MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp", MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp", + MAME_DIR .. "src/tools/imgtool/modules/dgndos.cpp", MAME_DIR .. "src/tools/imgtool/modules/os9.cpp", - MAME_DIR .. "src/tools/imgtool/modules/mac.cpp", MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp", MAME_DIR .. "src/tools/imgtool/modules/ti990hd.cpp", MAME_DIR .. "src/tools/imgtool/modules/concept.cpp", @@ -731,11 +706,8 @@ files { MAME_DIR .. "src/tools/imgtool/modules/fat.h", MAME_DIR .. "src/tools/imgtool/modules/pc_flop.cpp", MAME_DIR .. "src/tools/imgtool/modules/pc_hard.cpp", - MAME_DIR .. "src/tools/imgtool/modules/prodos.cpp", MAME_DIR .. "src/tools/imgtool/modules/vzdos.cpp", MAME_DIR .. "src/tools/imgtool/modules/thomson.cpp", - MAME_DIR .. "src/tools/imgtool/modules/macutil.cpp", - MAME_DIR .. "src/tools/imgtool/modules/macutil.h", MAME_DIR .. "src/tools/imgtool/modules/cybiko.cpp", MAME_DIR .. "src/tools/imgtool/modules/cybikoxt.cpp", MAME_DIR .. "src/tools/imgtool/modules/psion.cpp", @@ -775,7 +747,7 @@ if _OPTIONS["targetos"] == "macosx" then } dependency { - { "aueffectutil", MAME_DIR .. "src/tools/aueffectutil-Info.plist", true }, + { "aueffectutil", MAME_DIR .. "src/tools/aueffectutil-Info.plist", true }, } links { @@ -813,19 +785,17 @@ if (_OPTIONS["osd"] == "sdl") then end links { + "utils", "ocore_" .. _OPTIONS["osd"], ext_lib("utf8proc"), } if _OPTIONS["targetos"]=="windows" then - if _OPTIONS["with-bundled-sdl2"]~=nil then + if _OPTIONS["USE_LIBSDL"]~="1" then configuration { "mingw*"} links { + "SDL2main", "SDL2", - "imm32", - "version", - "ole32", - "oleaut32", } configuration { "vs*" } links { @@ -835,47 +805,25 @@ if (_OPTIONS["osd"] == "sdl") then } 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") - } + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) end - end - - if BASE_TARGETOS=="unix" then - if _OPTIONS["with-bundled-sdl2"]~=nil then - links { - "SDL2", + 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 dofile("osd/sdl_cfg.lua") includedirs { MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib/util", } files { |