aboutsummaryrefslogtreecommitdiffstats
path: root/code/qcommon
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-01-15 15:22:13 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-01-15 15:22:13 +0000
commitfcaf3865a609589bc57691c8a6fc6836a4e21e2d (patch)
tree1f6b5d989ede087a41c197d772639799b68f279b /code/qcommon
parent13be4dcd23eb6533973f523d27e95e9905a4a2f5 (diff)
downloadioquake3-aero-fcaf3865a609589bc57691c8a6fc6836a4e21e2d.tar.gz
ioquake3-aero-fcaf3865a609589bc57691c8a6fc6836a4e21e2d.zip
* x86 OS X support
git-svn-id: svn://svn.icculus.org/quake3/trunk@484 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon')
-rw-r--r--code/qcommon/vm_x86.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c
index 15e9918..79074d9 100644
--- a/code/qcommon/vm_x86.c
+++ b/code/qcommon/vm_x86.c
@@ -170,7 +170,7 @@ _asm {
#else //!_MSC_VER
-#ifdef __MINGW32__ // _ is prepended to compiled symbols
+#if defined(__MINGW32__) || defined(MACOS_X) // _ is prepended to compiled symbols
#define CMANG(sym) "_"#sym
#else
#define CMANG(sym) #sym
@@ -1174,13 +1174,13 @@ int VM_CallCompiled( vm_t *vm, int *args ) {
memOpStack = opStack;
memEntryPoint = entryPoint;
- __asm__(" pushal \r\n" \
- " movl %0,%%esi \r\n" \
- " movl %1,%%edi \r\n" \
- " call *%2 \r\n" \
- " movl %%esi,%0 \r\n" \
- " movl %%edi,%1 \r\n" \
- " popal \r\n" \
+ __asm__(" pushal \n" \
+ " movl %0,%%esi \n" \
+ " movl %1,%%edi \n" \
+ " call *%2 \n" \
+ " movl %%esi,%0 \n" \
+ " movl %%edi,%1 \n" \
+ " popal \n" \
: "=m" (memProgramStack), "=m" (memOpStack) \
: "m" (memEntryPoint), "m" (memProgramStack), "m" (memOpStack) \
: "si", "di" \