ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2024-11-10 07:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

make some ifdefs more specific to let this compile on more platforms

Browse source
This commit is contained in:
Jonathan Gray 2013-04-26 16:18:40 +10:00
parent fb2f55824f
commit 0ad40e0b6d
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
codemp/null/null_glimp.cpp
View file

@ -1,6 +1,6 @@
#include "../game/q_shared.h" #include "../game/q_shared.h"
#include "../renderer/tr_local.h" #include "../renderer/tr_local.h"
#ifdef __linux__ #ifndef _WIN32
typedef unsigned int GLenum; typedef unsigned int GLenum;
#endif #endif

2
codemp/qcommon/qcommon.h
View file

@ -977,7 +977,7 @@ void Sys_Log( const char *file, const void *buffer, int size, bool flush );
// any game related timing information should come from event timestamps // any game related timing information should come from event timestamps
int Sys_Milliseconds (bool baseTime = false); int Sys_Milliseconds (bool baseTime = false);
#if __linux__ #ifndef _MSVC_VER
extern "C" void Sys_SnapVector( float *v ); extern "C" void Sys_SnapVector( float *v );
#else #else

2
codemp/renderer/tr_local.h
View file

@ -28,7 +28,7 @@ typedef unsigned int glIndex_t;
#endif #endif
// fast float to int conversion // fast float to int conversion
#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123 #if (defined(_MSVC_VER) && defined(id386))
inline long myftol( float f ); inline long myftol( float f );
#else #else
#define myftol(x) ((int)(x)) #define myftol(x) ((int)(x))

2
codemp/renderer/tr_main.cpp
View file

@ -7,7 +7,7 @@
// Yeah, this might be kind of bad, but no linux version is planned so far :-) - AReis // Yeah, this might be kind of bad, but no linux version is planned so far :-) - AReis
// Gee- thanks guys - jdrews, the linux porter... // Gee- thanks guys - jdrews, the linux porter...
#ifndef _XBOX #ifndef _XBOX
#ifndef __linux__ #ifdef _WIN32
#include "../win32/glw_win.h" #include "../win32/glw_win.h"
#endif #endif
#endif #endif

2
codemp/renderer/tr_shade_calc.cpp
View file

@ -1206,7 +1206,7 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123 #if (defined(_MSVC_VER) && defined(id386))
#pragma warning (disable: 4035)//no return value #pragma warning (disable: 4035)//no return value
inline long myftol( float f ) { inline long myftol( float f ) {
static int tmp; static int tmp;