diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/video.lua | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/video.lua')
-rw-r--r-- | scripts/src/video.lua | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/scripts/src/video.lua b/scripts/src/video.lua index 069c2fc802d..6db6cd104e1 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -115,18 +115,6 @@ end -------------------------------------------------- -- ---@src/devices/video/crt9028.h,VIDEOS["CRT9028"] = true --------------------------------------------------- - -if (VIDEOS["CRT9028"]~=null) then - files { - MAME_DIR .. "src/devices/video/crt9028.cpp", - MAME_DIR .. "src/devices/video/crt9028.h", - } -end - --------------------------------------------------- --- --@src/devices/video/crt9212.h,VIDEOS["CRT9212"] = true -------------------------------------------------- @@ -605,18 +593,6 @@ end -------------------------------------------------- -- ---@src/devices/video/mm5445.h,VIDEOS["MM5445"] = true --------------------------------------------------- - -if (VIDEOS["MM5445"]~=null) then - files { - MAME_DIR .. "src/devices/video/mm5445.cpp", - MAME_DIR .. "src/devices/video/mm5445.h", - } -end - --------------------------------------------------- --- --@src/devices/video/msm6222b.h,VIDEOS["MSM6222B"] = true -------------------------------------------------- @@ -1172,15 +1148,3 @@ if (VIDEOS["PS2GS"]~=null) then MAME_DIR .. "src/devices/video/ps2gs.h", } end - --------------------------------------------------- --- ---@src/devices/video/decsfb.h,VIDEOS["DECSFB"] = true --------------------------------------------------- -if (VIDEOS["DECSFB"]~=null) then - files { - MAME_DIR .. "src/devices/video/decsfb.cpp", - MAME_DIR .. "src/devices/video/decsfb.h", - } -end - |