diff options
Diffstat (limited to 'scripts/src/osd')
-rw-r--r-- | scripts/src/osd/modules.lua | 28 | ||||
-rw-r--r-- | scripts/src/osd/osdmini.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 123 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 34 |
4 files changed, 33 insertions, 156 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index f1bfab95b08..91eaa395ba1 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -74,6 +74,7 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/input/input_common.cpp", MAME_DIR .. "src/osd/modules/input/input_common.h", MAME_DIR .. "src/osd/modules/input/input_dinput.cpp", + MAME_DIR .. "src/osd/modules/input/input_dinput.h", MAME_DIR .. "src/osd/modules/input/input_none.cpp", MAME_DIR .. "src/osd/modules/input/input_rawinput.cpp", MAME_DIR .. "src/osd/modules/input/input_win32.cpp", @@ -84,6 +85,27 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/input/input_windows.cpp", MAME_DIR .. "src/osd/modules/input/input_windows.h", MAME_DIR .. "src/osd/modules/input/input_xinput.cpp", + MAME_DIR .. "src/osd/modules/input/input_xinput.h", + MAME_DIR .. "src/osd/modules/input/input_winhybrid.cpp", + MAME_DIR .. "src/osd/modules/output/output_module.h", + 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/ipc/tcp_connection.cpp", + MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h", + MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp", + MAME_DIR .. "src/osd/modules/ipc/tcp_server.h", + MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.cpp", + MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.h", + MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.cpp", + MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.h", + MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.cpp", + MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.h", + MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.cpp", + MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.h", + } + includedirs { + ext_includedir("uv"), } if _OPTIONS["targetos"]=="windows" then @@ -126,10 +148,13 @@ function osdmodulesbuild() "__STDC_LIMIT_MACROS", "__STDC_FORMAT_MACROS", "__STDC_CONSTANT_MACROS", + "IMGUI_DISABLE_OBSOLETE_FUNCTIONS", } files { MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", + MAME_DIR .. "src/osd/modules/render/bgfxutil.cpp", + MAME_DIR .. "src/osd/modules/render/bgfxutil.h", MAME_DIR .. "src/osd/modules/render/binpacker.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/blendreader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp", @@ -169,7 +194,9 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp", } includedirs { + MAME_DIR .. "3rdparty/bgfx/examples/common", MAME_DIR .. "3rdparty/bgfx/include", + MAME_DIR .. "3rdparty/bgfx/3rdparty", MAME_DIR .. "3rdparty/bx/include", MAME_DIR .. "3rdparty/rapidjson/include", } @@ -393,6 +420,7 @@ function osdmodulestargetconf() "gdi32", "dsound", "dxguid", + "oleaut32", } elseif _OPTIONS["targetos"]=="macosx" then links { diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index 4869ec8716d..efdb28bd9c0 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -93,6 +93,10 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/input/input_windows.cpp", MAME_DIR .. "src/osd/modules/input/input_windows.h", MAME_DIR .. "src/osd/modules/input/input_xinput.cpp", + MAME_DIR .. "src/osd/modules/output/output_module.h", + MAME_DIR .. "src/osd/modules/output/none.cpp", + MAME_DIR .. "src/osd/modules/output/console.cpp", + MAME_DIR .. "src/osd/modules/output/network.cpp", } project ("ocore_" .. _OPTIONS["osd"]) diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index f1d307b8cab..c42d9ab23ad 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -368,7 +368,7 @@ project ("osd_" .. _OPTIONS["osd"]) if _OPTIONS["targetos"]=="windows" then files { - MAME_DIR .. "src/osd/sdl/main.cpp", + MAME_DIR .. "src/osd/windows/main.cpp", } end @@ -425,7 +425,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/sdl/window.h", MAME_DIR .. "src/osd/modules/osdwindow.cpp", MAME_DIR .. "src/osd/modules/osdwindow.h", - MAME_DIR .. "src/osd/sdl/output.cpp", MAME_DIR .. "src/osd/sdl/watchdog.cpp", MAME_DIR .. "src/osd/sdl/watchdog.h", MAME_DIR .. "src/osd/modules/render/drawsdl.cpp", @@ -461,7 +460,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/sdl/sdldir.cpp", - MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".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", @@ -495,123 +493,4 @@ project ("ocore_" .. _OPTIONS["osd"]) } end - if _OPTIONS["targetos"]=="macosx" then - files { - MAME_DIR .. "src/osd/sdl/osxutils.h", - MAME_DIR .. "src/osd/sdl/osxutils.mm", - } - end - - --------------------------------------------------- --- testkeys --------------------------------------------------- - -if _OPTIONS["with-tools"] then - project("testkeys") - uuid ("744cec21-c3b6-4d69-93cb-6811fed0ffe3") - kind "ConsoleApp" - - flags { - "Symbols", -- always include minimum symbols for executables - } - - dofile("sdl_cfg.lua") - - includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", - } - - if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) - end - - links { - "utils", - "ocore_" .. _OPTIONS["osd"], - } - - files { - MAME_DIR .. "src/osd/sdl/testkeys.cpp", - } - - if _OPTIONS["targetos"] == "windows" then - if _OPTIONS["USE_LIBSDL"]~="1" then - configuration { "mingw*"} - links { - "SDL2.dll", - } - configuration { "vs*" } - links { - "SDL2", - "Imm32", - "Version", - } - configuration { } - else - local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") - addlibfromstring(str) - addoptionsfromstring(str) - end - links { - "psapi", - } - linkoptions{ - "-municode", - } - files { - MAME_DIR .. "src/osd/sdl/main.cpp", - } - end - - configuration { "mingw*" or "vs*" } - targetextension ".exe" - - configuration { } - - strip() -end - - --------------------------------------------------- --- aueffectutil --------------------------------------------------- - -if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then - project("aueffectutil") - uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e") - kind "ConsoleApp" - flags { - "Symbols", -- always include minimum symbols for executables - } - - dofile("sdl_cfg.lua") - - if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) - end - - linkoptions { - "-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist", - } - - dependency { - { "aueffectutil", MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist", true }, - } - - links { - "AudioUnit.framework", - "AudioToolbox.framework", - "CoreAudio.framework", - "CoreAudioKit.framework", - "CoreServices.framework", - } - - files { - MAME_DIR .. "src/osd/sdl/aueffectutil.mm", - } - - strip() -end diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index f9a886dc176..e4be22d6e55 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -165,8 +165,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/render/drawgdi.h", MAME_DIR .. "src/osd/modules/render/drawnone.cpp", MAME_DIR .. "src/osd/modules/render/drawnone.h", - MAME_DIR .. "src/osd/windows/output.cpp", - MAME_DIR .. "src/osd/windows/output.h", MAME_DIR .. "src/osd/windows/video.cpp", MAME_DIR .. "src/osd/windows/video.h", MAME_DIR .. "src/osd/windows/window.cpp", @@ -253,7 +251,6 @@ project ("ocore_" .. _OPTIONS["osd"]) 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/windows/winclip.cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/modules/file/winfile.cpp", @@ -263,34 +260,3 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp", MAME_DIR .. "src/osd/modules/sync/work_osd.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 |