diff options
author | 2016-08-13 01:00:52 +1000 | |
---|---|---|
committer | 2016-08-13 01:00:52 +1000 | |
commit | 41e4133d0bea0b0cbef328ce285fbf9e628e5093 (patch) | |
tree | d7e357a4f9cac8d11cca5fb1bdb7209a4b778263 /src/emu/image.cpp | |
parent | b966180061af0c4702bac7eab75b2c357e4d0085 (diff) | |
parent | 9f5325a31145baa173c90d2f3b08ac363b4f53a5 (diff) |
Merge pull request #1222 from npwoods/move_software_name_parsing
device_image_interface::software_name_split() ==> softlist.cpp:software_name_parse()
Diffstat (limited to 'src/emu/image.cpp')
-rw-r--r-- | src/emu/image.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/emu/image.cpp b/src/emu/image.cpp index 5fbc5844b9d..06998ad37e6 100644 --- a/src/emu/image.cpp +++ b/src/emu/image.cpp @@ -10,19 +10,13 @@ ***************************************************************************/ #include <ctype.h> -#include <regex> #include "emu.h" #include "emuopts.h" #include "image.h" #include "config.h" #include "xmlfile.h" - -//************************************************************************** -// STATIC VARIABLES -//************************************************************************** - -static std::regex s_potenial_softlist_regex("\\w+(\\:\\w+\\:\\w+)?"); +#include "softlist.h" //************************************************************************** @@ -54,7 +48,7 @@ image_manager::image_manager(running_machine &machine) image.set_init_phase(); // try as a softlist - if (std::regex_match(image_name, s_potenial_softlist_regex)) + if (software_name_parse(image_name)) result = image.load_software(image_name); // failing that, try as an image |