aboutsummaryrefslogtreecommitdiffstats
path: root/code/unix
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/unix
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/unix')
-rw-r--r--code/unix/ftola.s16
-rw-r--r--code/unix/qasm.h2
-rw-r--r--code/unix/snapvectora.s4
3 files changed, 11 insertions, 11 deletions
diff --git a/code/unix/ftola.s b/code/unix/ftola.s
index 7fb24c0..7e9c523 100644
--- a/code/unix/ftola.s
+++ b/code/unix/ftola.s
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.data
-temp: .float 0.0
+temp: .single 0.0
fpucw: .long 0
// Precision Control Field , 2 bits / 0x0300
@@ -63,7 +63,7 @@ cw0F7F: .long 0x0F7F
// int qftol( void ) - default control word
//
-.global C(qftol)
+.globl C(qftol)
C(qftol):
fistpl temp
@@ -75,7 +75,7 @@ C(qftol):
// int qftol027F( void ) - DirectX FPU
//
-.global C(qftol027F)
+.globl C(qftol027F)
C(qftol027F):
fnstcw fpucw
@@ -89,7 +89,7 @@ C(qftol027F):
// int qftol037F( void ) - Linux FPU
//
-.global C(qftol037F)
+.globl C(qftol037F)
C(qftol037F):
fnstcw fpucw
@@ -104,7 +104,7 @@ C(qftol037F):
// int qftol0F7F( void ) - ANSI
//
-.global C(qftol0F7F)
+.globl C(qftol0F7F)
C(qftol0F7F):
fnstcw fpucw
@@ -118,7 +118,7 @@ C(qftol0F7F):
// int qftol0E7F( void )
//
-.global C(qftol0E7F)
+.globl C(qftol0E7F)
C(qftol0E7F):
fnstcw fpucw
@@ -134,7 +134,7 @@ C(qftol0E7F):
// long Q_ftol( float q )
//
-.global C(Q_ftol)
+.globl C(Q_ftol)
C(Q_ftol):
flds 4(%esp)
@@ -147,7 +147,7 @@ C(Q_ftol):
// long qftol0F7F( float q ) - Linux FPU
//
-.global C(Q_ftol0F7F)
+.globl C(Q_ftol0F7F)
C(Q_ftol0F7F):
fnstcw fpucw
diff --git a/code/unix/qasm.h b/code/unix/qasm.h
index 6c63409..c32aafc 100644
--- a/code/unix/qasm.h
+++ b/code/unix/qasm.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/q_platform.h"
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(MACOS_X)
#undef ELF
#endif
diff --git a/code/unix/snapvectora.s b/code/unix/snapvectora.s
index 3f9d330..11294a0 100644
--- a/code/unix/snapvectora.s
+++ b/code/unix/snapvectora.s
@@ -46,7 +46,7 @@ cw037F: .long 0x037F
.text
// void Sys_SnapVector( float *v )
-.global C(Sys_SnapVector)
+.globl C(Sys_SnapVector)
C(Sys_SnapVector):
pushl %eax
pushl %ebp
@@ -74,7 +74,7 @@ C(Sys_SnapVector):
ret
// void Sys_SnapVectorCW( float *v, unsigned short int cw )
-.global C(Sys_SnapVectorCW)
+.globl C(Sys_SnapVectorCW)
C(Sys_SnapVectorCW):
pushl %eax
pushl %ebp