summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/3rdparty.lua
diff options
context:
space:
mode:
author cam900 <dbtlrchl@naver.com>2018-12-29 09:57:29 +0900
committer GitHub <noreply@github.com>2018-12-29 09:57:29 +0900
commit6a96ec51913434e1edd46d6e49ece928a882eb18 (patch)
treeb3e656c7db7f6e4bd3e18a54d4cd5a511151dffd /scripts/src/3rdparty.lua
parent569b2cc9cfe2326e7e06fea4ff1e03ad59398c06 (diff)
parenta67dd2df3cbd9dbdc907e78880138a6d83875f51 (diff)
Merge branch 'master' into ymf278_envelope
Diffstat (limited to 'scripts/src/3rdparty.lua')
-rw-r--r--scripts/src/3rdparty.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 7c1cc4acf4c..2ccfa749e19 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -1198,6 +1198,7 @@ project "bimg"
files {
MAME_DIR .. "3rdparty/bimg/src/image.cpp",
+ MAME_DIR .. "3rdparty/bimg/src/image_gnf.cpp",
}
--------------------------------------------------
@@ -1324,12 +1325,10 @@ end
files {
MAME_DIR .. "3rdparty/bgfx/src/bgfx.cpp",
MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/dxgi.cpp",
MAME_DIR .. "3rdparty/bgfx/src/glcontext_egl.cpp",
MAME_DIR .. "3rdparty/bgfx/src/glcontext_glx.cpp",
MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/hmd.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/hmd_ovr.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/hmd_openvr.cpp",
MAME_DIR .. "3rdparty/bgfx/src/nvapi.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp",
@@ -1347,8 +1346,9 @@ end
MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp",
- MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp",
- MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui_draw.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui_widgets.cpp",
}
if _OPTIONS["targetos"]=="macosx" then
files {