diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-03-08 15:46:20 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-03-08 15:46:20 +0100 |
commit | de04399afa83f51d16e2ae497f87a8d885282254 (patch) | |
tree | 4eae2a05781f6deda0a2f361a1ea83bb7faddacb /scripts | |
parent | e8546abde9953f5f36227525c09bc4a3a2db4687 (diff) |
Fixed osdmini building for android and pnacl (nw)
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/src/emu.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/osdmini.lua | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index ac6ed9359aa..e71103a26b6 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -40,7 +40,7 @@ if _OPTIONS["with-bundled-lua"] then } end -if (_OPTIONS["targetos"] == "windows") then +if (_OPTIONS["targetos"] == "windows" and _OPTIONS["osd"] ~= "osdmini") then defines { "UI_WINDOWS", } diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index cc794ae88df..52a28147c32 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -65,6 +65,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/lib/osdobj_common.h", MAME_DIR .. "src/osd/modules/font/font_sdl.cpp", MAME_DIR .. "src/osd/modules/font/font_windows.cpp", + MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp", MAME_DIR .. "src/osd/modules/font/font_osx.cpp", MAME_DIR .. "src/osd/modules/font/font_none.cpp", MAME_DIR .. "src/osd/modules/netdev/taptun.cpp", |