From af0a67c0f716c529b3f278c3b6ed03e9d0d0bdc9 Mon Sep 17 00:00:00 2001 From: Justin Kerk Date: Sat, 5 Mar 2016 22:22:21 +0000 Subject: [PATCH] Restore uismall.png for now so that Emscripten menus work (nw) --- scripts/src/emu.lua | 11 ++++++++++- src/emu/uismall.png | Bin 0 -> 1488 bytes 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/emu/uismall.png diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index c834c314c77..ac6ed9359aa 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -412,8 +412,17 @@ dependency { } +if (_OPTIONS["targetos"]=="asmjs") then + custombuildtask { + { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }}, + } +else + custombuildtask { + { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }}, + } +end + custombuildtask { - { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }}, { MAME_DIR .. "src/emu/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }}, layoutbuildtask("emu/layout", "dualhovu"), diff --git a/src/emu/uismall.png b/src/emu/uismall.png new file mode 100644 index 0000000000000000000000000000000000000000..5d391640f62252bf1ddf91cc9fc378ee62eb2fdc GIT binary patch literal 1488 zcmV;>1uy!EP)m?RG)so_x?EcYlufZUZLKSg_DJUtcrv`Ln;F= z3|})uwdy02Y1w}4bF0l*Qzb!Wdy5_dAE?Z_5(vpD4UVjZW1Z~Z4 zJ+_3$_Z7dDqMovIHWH1E{d70-X?Q7U=3~0fjBd4H@xkFZk0h|{mGr80{f(4q$`ax& z!7Bw7afZYOZ@f*{y zHd~GJngoc|YC)&Jc3pjGJk?8JWz8f;&!AQ3Ogx;5?oi zf9Rzy9wO()CHCGyfUd{xgd@>JpiGdib%&T{C?CJkS`_isJD=h!grsHRy5)+L;$IMg zD@kE7D;$u#<>0fOn{Qd-T$!_hB$1iz1qaJq6#|VCm@zF;{YJHD8QBr0t(w|YH&TF< z4}Ox5&x1=9@|AL&N$XNmX7*(&Kav{C1BHc96ZNuE)dC@ks3c zIC%%zZ`WU_%xU^PjzSB%?wFh>-kT1y1Lk{>*#nmhOg`B#KeK1nci1#XXI65se$_& zI!Z6?O-r5|6o}0TKv_voGWA`E9NbKtqq4B=HNZ-KzyZ+0a z#7(3Dos{Kf3ilQ_Ry{8L5tcJI)UO+(#OF>pC_OE%tpG z9lJdii}JxTS-!Ao0EF+bg{)~1Qr$KXo;Bbks1Rp!|FFPf4WX?B(h1>gXrQv#fAC1F zB!Yu|G~kpN>lW# z5xrCQingb&JI}^Y=jnL&M8K|{iUW;0zReakAt^RzZ@O0qw~Z``=q=$MYUrdanTj;) zk&LoB)6&I^;;#5!)|*-HlrZ-M9}Lke`IDDiQJ-}7FyDGJ%}4Ju7J0VL0Ae=jigey1 zqa*GNYR=>MOv{qIXY*bzzFqssE?tM;Z$$9nlVDxrH``Y-wpGSIcdd#l8kNZzm+`M1 z6w>ldkWe&BKRO25;%A?p`FRC{$)xe=xk3`eE=YE%RfWa2R~7LWHjTB$(m22 zo!6ArL$<)|Ub-Idi@0qU17?^oVZww76DCZUFk!-k2@@tvm@r|&gb5QSOqeiX!h{JE qCQO(xVZww76DCZUFk$k)k$(XZh