ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2024-11-25 21:51:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't try to compile c files as c++

Browse source
This commit is contained in:
Jonathan Gray 2013-04-26 00:08:03 +10:00
parent ecd674b852
commit b1f71d5b81
3 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
codemp/game/g_ICARUScb.c
View file

@ -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 // 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. // scenario, but I think we'll just try to leave this out instead.
#ifndef _XBOX #ifndef _XBOX
#ifndef __linux__
enum enum
{ {
TK_EOF = -1, TK_EOF = -1,
@ -43,7 +42,6 @@ enum
TK_USERDEF, TK_USERDEF,
}; };
#endif #endif
#endif
#include "../icarus/interpreter.h" #include "../icarus/interpreter.h"

6
codemp/game/g_main.c
View file

@ -509,9 +509,6 @@ This must be the very first function compiled into the .q3vm file
================ ================
*/ */
#include "../namespace_begin.h" #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 ) { 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 ) { switch ( command ) {
case GAME_INIT: 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; return -1;
} }
#ifdef __linux__
}
#endif
#include "../namespace_end.h" #include "../namespace_end.h"

6
codemp/game/g_syscalls.c
View file

@ -8,15 +8,9 @@
static int (QDECL *syscall)( int arg, ... ) = (int (QDECL *)( int, ...))-1; static int (QDECL *syscall)( int arg, ... ) = (int (QDECL *)( int, ...))-1;
#include "../namespace_begin.h" #include "../namespace_begin.h"
#ifdef __linux__
extern "C" {
#endif
void dllEntry( int (QDECL *syscallptr)( int arg,... ) ) { void dllEntry( int (QDECL *syscallptr)( int arg,... ) ) {
syscall = syscallptr; syscall = syscallptr;
} }
#ifdef __linux__
}
#endif
int PASSFLOAT( float x ) { int PASSFLOAT( float x ) {
float floatTemp; float floatTemp;