mirror of
https://github.com/ioquake/jedi-academy.git
synced 2024-11-10 07:11:44 +00:00
don't try to compile c files as c++
This commit is contained in:
parent
ecd674b852
commit
b1f71d5b81
3 changed files with 1 additions and 15 deletions
|
@ -27,7 +27,6 @@ extern stringID_table_t BSTable[];
|
|||
// so that we only get the C version of the includes (no full Icarus) in that
|
||||
// scenario, but I think we'll just try to leave this out instead.
|
||||
#ifndef _XBOX
|
||||
#ifndef __linux__
|
||||
enum
|
||||
{
|
||||
TK_EOF = -1,
|
||||
|
@ -43,7 +42,6 @@ enum
|
|||
TK_USERDEF,
|
||||
};
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "../icarus/interpreter.h"
|
||||
|
||||
|
|
|
@ -509,9 +509,6 @@ This must be the very first function compiled into the .q3vm file
|
|||
================
|
||||
*/
|
||||
#include "../namespace_begin.h"
|
||||
#ifdef __linux__
|
||||
extern "C" {
|
||||
#endif
|
||||
int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11 ) {
|
||||
switch ( command ) {
|
||||
case GAME_INIT:
|
||||
|
@ -694,9 +691,6 @@ int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int a
|
|||
|
||||
return -1;
|
||||
}
|
||||
#ifdef __linux__
|
||||
}
|
||||
#endif
|
||||
#include "../namespace_end.h"
|
||||
|
||||
|
||||
|
@ -4117,4 +4111,4 @@ const char *G_GetStringEdString(char *refSection, char *refName)
|
|||
static char text[1024]={0};
|
||||
Com_sprintf(text, sizeof(text), "@@@%s", refName);
|
||||
return text;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,15 +8,9 @@
|
|||
static int (QDECL *syscall)( int arg, ... ) = (int (QDECL *)( int, ...))-1;
|
||||
|
||||
#include "../namespace_begin.h"
|
||||
#ifdef __linux__
|
||||
extern "C" {
|
||||
#endif
|
||||
void dllEntry( int (QDECL *syscallptr)( int arg,... ) ) {
|
||||
syscall = syscallptr;
|
||||
}
|
||||
#ifdef __linux__
|
||||
}
|
||||
#endif
|
||||
|
||||
int PASSFLOAT( float x ) {
|
||||
float floatTemp;
|
||||
|
|
Loading…
Reference in a new issue