From 19d52cef70b0ef0c373ddb8c49cefd179d309f37 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 1 Apr 2015 16:11:48 +1100 Subject: Bring back NOASM --- scripts/src/osd/sdl.lua | 14 ++++++++++---- scripts/src/osd/windows.lua | 11 ++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 732442d70b9..96b171c0192 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -382,12 +382,18 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/osdmodule.c", MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".c", MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".c", - --ifdef NOASM - --MAME_DIR .. "src/osd/modules/sync/work_mini.c", - --else - MAME_DIR .. "src/osd/modules/sync/work_osd.c", } + if _OPTIONS["NOASM"]=="1" then + files { + MAME_DIR .. "src/osd/modules/sync/work_mini.c", + } + else + files { + MAME_DIR .. "src/osd/modules/sync/work_osd.c", + } + end + if _OPTIONS["targetos"]=="macosx" then files { MAME_DIR .. "src/osd/sdl/osxutils.m", diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 03d3948dd4f..8774c848eec 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -150,10 +150,19 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/windows/winsocket.c", MAME_DIR .. "src/osd/windows/winptty.c", MAME_DIR .. "src/osd/modules/osdmodule.c", - MAME_DIR .. "src/osd/modules/sync/work_osd.c", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.c", } + if _OPTIONS["NOASM"]=="1" then + files { + MAME_DIR .. "src/osd/modules/sync/work_mini.c", + } + else + files { + MAME_DIR .. "src/osd/modules/sync/work_osd.c", + } + end + -------------------------------------------------- -- ledutil -- cgit v1.2.3-70-g09d2