diff options
author | 2016-06-29 20:24:44 +1000 | |
---|---|---|
committer | 2016-06-29 20:24:44 +1000 | |
commit | d464963202d6fac34b687f232a42a1d3353630c2 (patch) | |
tree | e4281c2e2b2832b005ca866db5f901f28e507139 /docs/release/scripts/src/osd | |
parent | afef8430619718d39dd7906a9342fe3bd06b6225 (diff) |
0.175 Release fileshbmame175
Diffstat (limited to 'docs/release/scripts/src/osd')
-rw-r--r-- | docs/release/scripts/src/osd/modules.lua | 4 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/newui.lua | 3 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl.lua | 15 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/windows.lua | 36 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/winui.lua | 3 |
5 files changed, 47 insertions, 14 deletions
diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index a05e55ee4c6..b8e5bb61b83 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -96,6 +96,8 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/output/none.cpp", MAME_DIR .. "src/osd/modules/output/console.cpp", MAME_DIR .. "src/osd/modules/output/network.cpp", + MAME_DIR .. "src/osd/modules/output/win32_output.cpp", + MAME_DIR .. "src/osd/modules/output/win32_output.h", MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp", MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h", MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp", @@ -242,7 +244,7 @@ function qtdebuggerbuild() } local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then - configuration { "gmake" } + configuration { "gmake or ninja" } if (version >= 30600) then buildoptions { "-Wno-inconsistent-missing-override", diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua index a86228e7c4c..a2e95a665da 100644 --- a/docs/release/scripts/src/osd/newui.lua +++ b/docs/release/scripts/src/osd/newui.lua @@ -130,7 +130,6 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", @@ -225,7 +224,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/windows/main.cpp", - MAME_DIR .. "src/osd/windows/windir.cpp", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", @@ -234,6 +232,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows/winutil.h", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index d1a83229698..4094e48c6be 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -239,7 +239,7 @@ elseif _OPTIONS["targetos"]=="macosx" then SDL_NETWORK = "pcap" end -if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" then +if _OPTIONS["with-bundled-sdl2"]~=nil then includedirs { GEN_DIR .. "includes", } @@ -295,10 +295,12 @@ if BASE_TARGETOS=="unix" then "/usr/openwin/lib", } end - if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then - links { - "SDL2", - } + if _OPTIONS["with-bundled-sdl2"]~=nil then + if _OPTIONS["targetos"]~="android" then + links { + "SDL2", + } + end else local str = backtick(sdlconfigcmd() .. " --libs") addlibfromstring(str) @@ -459,7 +461,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", - MAME_DIR .. "src/osd/sdl/sdldir.cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp", @@ -468,6 +469,7 @@ project ("ocore_" .. _OPTIONS["osd"]) if BASE_TARGETOS=="unix" then files { + MAME_DIR .. "src/osd/modules/file/posixdir.cpp", MAME_DIR .. "src/osd/modules/file/posixfile.cpp", MAME_DIR .. "src/osd/modules/file/posixfile.h", MAME_DIR .. "src/osd/modules/file/posixptty.cpp", @@ -478,6 +480,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows", } files { + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua index b4be2dc7ce4..a6e40c7aadc 100644 --- a/docs/release/scripts/src/osd/windows.lua +++ b/docs/release/scripts/src/osd/windows.lua @@ -154,8 +154,6 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", - MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h", @@ -246,16 +244,48 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/main.cpp", - MAME_DIR .. "src/osd/windows/windir.cpp", MAME_DIR .. "src/osd/windows/winutf8.cpp", MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", MAME_DIR .. "src/osd/windows/winutil.h", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", MAME_DIR .. "src/osd/modules/file/winsocket.cpp", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp", } + + + +-------------------------------------------------- +-- ledutil +-------------------------------------------------- + +if _OPTIONS["with-tools"] then + project("ledutil") + uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables + } + + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + links { + "ocore_" .. _OPTIONS["osd"], + } + + includedirs { + MAME_DIR .. "src/osd", + } + + files { + MAME_DIR .. "src/osd/windows/ledutil.cpp", + } +end diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index 1056384647d..85f122bfa16 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -153,7 +153,6 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", @@ -276,7 +275,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/windows/main.cpp", - MAME_DIR .. "src/osd/windows/windir.cpp", MAME_DIR .. "src/osd/osdsync.cpp", MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", @@ -285,6 +283,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows/winutil.h", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/windir.cpp", MAME_DIR .. "src/osd/modules/file/winfile.cpp", MAME_DIR .. "src/osd/modules/file/winfile.h", MAME_DIR .. "src/osd/modules/file/winptty.cpp", |