teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hopefully this will fix win32 msvc.netsuperduper++220000 extra entropy edition 

compilation, and I updated the readme a little apparently.
This commit is contained in:
Zachary Slater 2005-09-26 02:36:52 +00:00
parent ae9fbe3288
commit aff4d7d858
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/qcommon/vm_x86.c
View File

@ -60,10 +60,10 @@ int _ftol( float );
static int ftolPtr = (int)_ftol; static int ftolPtr = (int)_ftol;
#endif #endif
void doAsmCall( void ); void AsmCall( void );
static int asmCallPtr = (int)doAsmCall; static int asmCallPtr = (int)AsmCall;
#else // _WIN32 #else // _MSC_VER
#if defined( FTOL_PTR ) #if defined( FTOL_PTR )
// bk001213 - BEWARE: does not work! UI menu etc. broken - stack! // bk001213 - BEWARE: does not work! UI menu etc. broken - stack!
@ -79,8 +79,8 @@ int qftol0F7F( void );
static int ftolPtr = (int)qftol0F7F; static int ftolPtr = (int)qftol0F7F;
#endif // FTOL_PTR #endif // FTOL_PTR
void doAsmCall( void ); void AsmCall( void );
static int asmCallPtr = (int)doAsmCall; static int asmCallPtr = (int)AsmCall;
#endif // !_WIN32 #endif // !_WIN32
@ -198,7 +198,7 @@ void callAsmCall(void)
} }
void AsmCall( void ) { void AsmCall( void ) {
asm( CMANG(doAsmCall) ": \n\t" \ asm( CMANG(AsmCall) ": \n\t" \
" movl (%%edi),%%eax \n\t" \ " movl (%%edi),%%eax \n\t" \
" subl $4,%%edi \n\t" \ " subl $4,%%edi \n\t" \
" orl %%eax,%%eax \n\t" \ " orl %%eax,%%eax \n\t" \

4
code/renderer/tr_model.c
View File

@ -180,9 +180,9 @@ qhandle_t RE_RegisterModel( const char *name ) {
for ( lod = MD3_MAX_LODS - 1 ; lod >= 0 ; lod-- ) { for ( lod = MD3_MAX_LODS - 1 ; lod >= 0 ; lod-- ) {
if ( lod ) if ( lod )
snprintf(namebuf, sizeof(namebuf), "%s_%d.%s", filename, lod, fext); Com_sprintf(namebuf, sizeof(namebuf), "%s_%d.%s", filename, lod, fext);
else else
snprintf(namebuf, sizeof(namebuf), "%s.%s", filename, fext); Com_sprintf(namebuf, sizeof(namebuf), "%s.%s", filename, fext);
ri.FS_ReadFile( namebuf, (void **)&buf ); ri.FS_ReadFile( namebuf, (void **)&buf );
if ( !buf ) { if ( !buf ) {

4
code/win32/win_main.c
View File

@ -606,8 +606,8 @@ void * QDECL Sys_LoadDll( const char *name, char *fqpath , long (QDECL **entryPo
} }
#endif #endif
dllEntry = ( void (QDECL *)( int (QDECL *)( int, ... ) ) )GetProcAddress( libHandle, "dllEntry" ); dllEntry = ( void (QDECL *)(long (QDECL *)( long, ... ) ) )GetProcAddress( libHandle, "dllEntry" );
*entryPoint = (int (QDECL *)(int,...))GetProcAddress( libHandle, "vmMain" ); *entryPoint = (long (QDECL *)(long,...))GetProcAddress( libHandle, "vmMain" );
if ( !*entryPoint || !dllEntry ) { if ( !*entryPoint || !dllEntry ) {
FreeLibrary( libHandle ); FreeLibrary( libHandle );
return NULL; return NULL;

5
i_o-q3-readme
View File

@ -4,6 +4,9 @@ Hello and welcome to the Quake 3 source repository on icculus.org
I'll be your maintainer, zakk@icculus.org, please send all your patches to I'll be your maintainer, zakk@icculus.org, please send all your patches to
the bugzilla: https://bugzilla.icculus.org, or join the mailing list the bugzilla: https://bugzilla.icculus.org, or join the mailing list
(quake3-subscribe@icculus.org) and submit your patch there. (quake3-subscribe@icculus.org) and submit your patch there.
Best case scenario is you subscribe to the ml, submit your patch to
bugzilla, and then post the url to the mailing list.
If you're too lazy for either method, then I would rather If you're too lazy for either method, then I would rather
you e-mailed your patches to me directly than not at all. you e-mailed your patches to me directly than not at all.
@ -85,7 +88,7 @@ follows:
> #endif // UNICODE > #endif // UNICODE
typedef const DIDEVICEINSTANCE *LPCDIDEVICEINSTANCE; typedef const DIDEVICEINSTANCE *LPCDIDEVICEINSTANCE;
...and comment out/remove the duplicated code (go Microsoft!) marked by '>'. ...and comment out/remove the duplicated code marked by '>'.
4. If you didn't install the DirectX SDK in C:\DXSDK\, edit DXSDK_DIR in 4. If you didn't install the DirectX SDK in C:\DXSDK\, edit DXSDK_DIR in
code/unix/Makefile to reflect the new location. code/unix/Makefile to reflect the new location.