summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-04-01 16:11:48 +1100
committer Vas Crabb <vas@vastheman.com>2015-04-01 16:12:03 +1100
commit19d52cef70b0ef0c373ddb8c49cefd179d309f37 (patch)
tree08bcd31f5ca3705aaa0141c2ac728f06e09be84f /src
parent2bd0eb2b0d39b7980750dbad0df400bad394762e (diff)
Bring back NOASM
Diffstat (limited to 'src')
-rw-r--r--src/osd/eminline.h2
-rw-r--r--src/osd/sdl/sdlmain.c2
-rw-r--r--src/osd/sdl/sdlprefix.h2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/osd/eminline.h b/src/osd/eminline.h
index 0772d3eea98..3fca94af079 100644
--- a/src/osd/eminline.h
+++ b/src/osd/eminline.h
@@ -13,7 +13,7 @@
#ifndef __EMINLINE__
#define __EMINLINE__
-#if !defined(SDLMAME_NOASM)
+#if !defined(MAME_NOASM)
/* we come with implementations for GCC x86 and PPC */
#if defined(__GNUC__)
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c
index e2cfc5898f4..af9a6976ce9 100644
--- a/src/osd/sdl/sdlmain.c
+++ b/src/osd/sdl/sdlmain.c
@@ -389,13 +389,13 @@ static void defines_verbose(void)
MACRO_VERBOSE(SDLMAME_DARWIN);
MACRO_VERBOSE(SDLMAME_LINUX);
MACRO_VERBOSE(SDLMAME_SOLARIS);
- MACRO_VERBOSE(SDLMAME_NOASM);
MACRO_VERBOSE(SDLMAME_IRIX);
MACRO_VERBOSE(SDLMAME_BSD);
osd_printf_verbose("\n");
osd_printf_verbose("Build defines 1: ");
MACRO_VERBOSE(LSB_FIRST);
MACRO_VERBOSE(PTR64);
+ MACRO_VERBOSE(MAME_NOASM);
MACRO_VERBOSE(MAME_DEBUG);
MACRO_VERBOSE(BIGENDIAN);
MACRO_VERBOSE(CPP_COMPILE);
diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index 69681043ef8..ed1b2e11204 100644
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -72,8 +72,6 @@
#if defined(EMSCRIPTEN)
#define SDLMAME_EMSCRIPTEN 1
#define SDLMAME_NO64BITIO 1
-#define NOASM 1
-#define SDLMAME_NOASM 1
struct _IO_FILE {}; //_IO_FILE is an opaque type in the emscripten libc which makes clang cranky
#endif