ioquake
/
jedi-academy
mirror of https://github.com/ioquake/jedi-academy.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

leave the masm assembly to msvc

This commit is contained in:
Jonathan Gray 2013-04-25 15:52:11 +10:00
parent f820286f06
commit f99cdcd1fa
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
codemp/game/q_math.c
View File

@ -802,9 +802,7 @@ int BoxOnPlaneSide2 (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
================== ==================
*/ */
#if !( (defined __linux__ || __FreeBSD__) && (defined __i386__) && (!defined C_ONLY)) // rb010123 #ifndef _MSC_VER
#if defined __LCC__ || defined C_ONLY || !id386
int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p) int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
{ {
@ -1103,7 +1101,6 @@ Lerror:
} }
#pragma warning( default: 4035 ) #pragma warning( default: 4035 )
#endif
#endif #endif
/* /*

4
codemp/qcommon/common.cpp
View File

@ -1809,8 +1809,7 @@ void Com_Shutdown (void)
*/ */
} }
#if !( defined __linux__ || defined __FreeBSD__ ) // r010123 - include FreeBSD #if !(defined(_MSVC_VER) && defined(id386))
#if ((!id386) && (!defined __i386__)) // rcg010212 - for PPC
void Com_Memcpy (void* dest, const void* src, const size_t count) void Com_Memcpy (void* dest, const void* src, const size_t count)
{ {
@ -2121,7 +2120,6 @@ skipClamp:
} }
} }
#endif
#endif // bk001208 - memset/memcpy assembly, Q_acos needed (RC4) #endif // bk001208 - memset/memcpy assembly, Q_acos needed (RC4)
//------------------------------------------------------------------------ //------------------------------------------------------------------------