diff options
Diffstat (limited to 'scripts/src/tools.lua')
-rw-r--r-- | scripts/src/tools.lua | 69 |
1 files changed, 24 insertions, 45 deletions
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 999ff594407..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"), } @@ -377,6 +382,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -463,7 +469,7 @@ includedirs { } defines { - "NL_DISABLE_DYNAMIC_LOAD=1", + "NL_DISABLE_DYNAMIC_LOAD=1", } files { @@ -554,6 +560,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -598,6 +605,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -612,6 +620,7 @@ 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*" } @@ -644,6 +653,7 @@ links { "7z", "ocore_" .. _OPTIONS["osd"], ext_lib("zlib"), + ext_lib("zstd"), ext_lib("flac"), ext_lib("utf8proc"), } @@ -686,11 +696,9 @@ files { 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", @@ -698,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", @@ -742,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 { @@ -786,14 +791,11 @@ if (_OPTIONS["osd"] == "sdl") then } 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 { @@ -803,41 +805,18 @@ 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") |