fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enhancement: Build Improvements (Unix + CoD Plugin) (#272)

Browse source
This commit is contained in:
Brad D 2024-09-13 13:15:15 -05:00 committed by GitHub
parent 97321a198a
commit 2e51fb74be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 235 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
CMakeLists.txt
View file

@ -113,6 +113,31 @@ ELSE()
ENDIF()
ENDIF()
# Added these to solve some build issues I ran into - Brad
IF(FTE_BIG_ENDIAN)
ADD_DEFINITIONS(-DFTE_BIG_ENDIAN)
ENDIF()
IF(FTE_LITTLE_ENDIAN)
ADD_DEFINITIONS(-DFTE_LITTLE_ENDIAN)
ENDIF()
# libepoll-shim needs to be installed on the BSDs and Mac OSX to get
# some of the server code to compile and work correctly on those platforms - Brad
IF(UNIX AND NOT LINUX AND NOT CYGWIN)
INCLUDE(FetchContent)
FetchContent_Declare(
epoll-shim
GIT_REPOSITORY https://github.com/jiixyj/epoll-shim.git
GIT_TAG master
)
SET(epoll-shim BUILD_TESTS OFF CACHE INTERNAL "")
SET(epoll-shim BUILD_SHARED_LIBS OFF CACHE INTERNAL "")
FetchContent_MakeAvailable(epoll-shim)
SET(EPOLL_INC_DIR "${epoll-shim_SOURCE_DIR}/include")
ENDIF()
SET(FTE_BUILD_CONFIG ${CMAKE_HOME_DIRECTORY}/engine/common/config_fteqw.h CACHE FILEPATH "Which build config file to use to control supported features.")
SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};CONFIG_FILE_NAME=${FTE_BUILD_CONFIG})
SET(FTE_USE_SDL false CACHE BOOL "Force the use of SDL instead of using native builds.")
@ -495,6 +520,12 @@ ELSEIF(UNIX AND NOT FTE_USE_SDL) #linux(ish)
ENDIF()
ENDIF()
IF(NOT LINUX AND NOT CYGWIN)
FIND_LIBRARY(epoll-shim REQUIRED)
INCLUDE_DIRECTORIES(${EPOLL_INC_DIR})
SET(FTESV_LIBS ${FTESV_LIBS} epoll-shim)
ENDIF()
SET(FTESV_DEFINES ${FTESV_DEFINES};MULTITHREAD)
SET(FTESV_ARCH_FILES ${FTESV_ARCH_FILES}
engine/server/sv_sys_unix.c
@ -1056,6 +1087,11 @@ ELSE()
${FTE_CLIENT_FILES}
${FTE_SERVER_FILES}
)
IF(UNIX AND NOT LINUX AND NOT CYGWIN)
FIND_LIBRARY(epoll-shim REQUIRED)
SET(FTE_INCLUDES ${FTE_INCLUDES} "${EPOLL_INC_DIR}")
SET(FTE_LIBS ${FTE_LIBS} epoll-shim)
ENDIF()
SET_TARGET_PROPERTIES(fteqw PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_DEFINES};${FTE_REVISON}")
TARGET_INCLUDE_DIRECTORIES(fteqw PUBLIC ${FTE_INCLUDES})
TARGET_LINK_LIBRARIES(fteqw ${FTE_LIBS})
@ -1158,8 +1194,13 @@ ELSE()
SET_TARGET_PROPERTIES(qtv PROPERTIES COMPILE_DEFINITIONS "${FTE_REVISON}")
IF(WIN32)
TARGET_LINK_LIBRARIES(qtv ws2_32 winmm ${SYS_LIBS} ${ZLIB_LIBRARIES})
ELSE()
ELSEIF(LINUX)
TARGET_LINK_LIBRARIES(qtv ${SYS_LIBS} ${ZLIB_LIBRARIES})
# Add Epoll-shim for the Unixes here - Brad
ELSE()
FIND_LIBRARY(epoll-shim REQUIRED)
TARGET_INCLUDE_DIRECTORIES(qtv PUBLIC "${EPOLL_INC_DIR}")
TARGET_LINK_LIBRARIES(qtv epoll-shim ${SYS_LIBS} ${ZLIB_LIBRARIES})
ENDIF()
SET(INSTALLTARGS ${INSTALLTARGS} qtv)
ENDIF()
@ -1202,6 +1243,10 @@ ELSE()
SET_TARGET_PROPERTIES(httpserver PROPERTIES COMPILE_DEFINITIONS "WEBSERVER;WEBSVONLY;${FTE_REVISON}")
IF(WIN32)
TARGET_LINK_LIBRARIES(httpserver ws2_32)
ELSEIF(UNIX AND NOT LINUX AND NOT CYGWIN)
FIND_LIBRARY(epoll-shim REQUIRED)
TARGET_INCLUDE_DIRECTORIES(httpserver PUBLIC "${EPOLL_INC_DIR}")
TARGET_LINK_LIBRARIES(httpserver epoll-shim)
ENDIF()
#SET(INSTALLTARGS ${INSTALLTARGS} httpserver)
ENDIF()
@ -1676,7 +1721,7 @@ IF(FTE_PLUG_XMPP)
)
SET_TARGET_PROPERTIES(plug_xmpp PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB_DEFINES}")
IF(${WIN32})
ELSE()
ELSEIF(LINUX OR APPLE)
TARGET_LINK_LIBRARIES(plug_xmpp ${SYS_LIBS} resolv)
ENDIF()

117
engine/client/cd_linux.c
View file

@ -20,6 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
// rights reserved.
/*
* All Unix porting was primarily focused on getting this to work on FreeBSD 14+
* but hopefully will give others the ability to further improve upon it.
* Most information sourced from the following documentation:
* Linux CDROM ioctl: https://www.kernel.org/doc/html/latest/userspace-api/ioctl/cdrom.html
* FreeBSD 14.0 cd man page: https://man.freebsd.org/cgi/man.cgi?query=cd&sektion=4&apropos=0&manpath=FreeBSD+14.0-RELEASE+and+Ports
* The cdio header file found at /usr/include/sys/cdio.h (very well documented about what everything does)
* - Brad
*/
#include "quakedef.h"
#ifndef HAVE_CDPLAYER
@ -40,10 +50,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <time.h>
#include <errno.h>
#if defined(__linux__)
#include <linux/cdrom.h>
#elif defined(__unix__) && !defined(__CYGWIN__)
#include <sys/cdio.h>
#define CDROMEJECT CDDOEJECT
#define CDROMCLOSETRAY CDDOCLOSE
#define CDROMPAUSE CDDOPAUSE
#define CDROMRESUME CDDORESUME
#define CDROMRESET CDDORESET
#define CDROMSTOP CDDOSTOP
#define CDROMSTART CDDOSTART
#define CDROMREADTOCHDR CDREADHEADER
#define CDROMREADTOCENTRY CDIOREADTOCENTRY
#define CDROMSUBCHNL CDREADSUBQ
#define CDROM_MSF CD_MSF_FORMAT
#define CDROM_DATA_TRACK CD_SUBQ_DATA
#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED
#define CDROM_AUDIO_PLAY CD_AS_PLAY_IN_PROGRESS
#endif
static int cdfile = -1;
#if defined(__unix__) && !defined(__APPLE__) && !defined(__CYGWIN__) && !defined(__linux__)
static char cd_dev[64] = "/dev/cd0";
#else
static char cd_dev[64] = "/dev/cdrom";
#endif
static qboolean playing;
void CDAudio_Eject(void)
@ -67,59 +99,109 @@ void CDAudio_CloseDoor(void)
int CDAudio_GetAudioDiskInfo(void)
{
#ifdef __linux__
struct cdrom_tochdr tochdr;
#elif defined(__unix__) && !defined(__CYGWIN__)
struct ioc_toc_header tochdr;
struct cd_sub_channel_track_info trk;
#endif
if (cdfile == -1)
return -1;
if ( ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1 )
{
{
Con_DPrintf("ioctl cdromreadtochdr failed\n");
return -1;
}
}
if (tochdr.cdth_trk0 < 1)
#ifdef __linux__
if (tochdr.cdth_trk0 < 1)
#elif defined(__unix__) && !defined(__CYGWIN__)
if (trk.track_number < 0) // track_number may not work correctly here - Brad
#endif
{
Con_DPrintf("CDAudio: no music tracks\n");
return -1;
}
#ifdef __linux__
return tochdr.cdth_trk1;
#elif defined(__unix__) && !defined(__CYGWIN__)
return tochdr.starting_track;
#else
Con_DPrintf("CDAudio: no music tracks\n");
return -1;
#endif
}
void CDAudio_Play(int track)
{
#ifdef __linux__
struct cdrom_tocentry entry;
struct cdrom_ti ti;
#elif defined(__unix__) && !defined(__CYGWIN__) // This all may be wrong, but it should be close - Brad
struct ioc_toc_header tochdr; // cd drive header info (for getting start and end track info mostly)
struct ioc_read_toc_single_entry entry; // individual audio track's entry info
struct cd_sub_channel_info ti; // individual audio track's subchannel info (for indexing and whatnot)
struct ioc_play_track play; // cd drive audio indexing
#endif
if (cdfile == -1)
return;
// don't try to play a non-audio track
#ifdef __linux__
entry.cdte_track = track;
entry.cdte_format = CDROM_MSF;
if ( ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1 )
#elif defined(__unix__) && !defined(__CYGWIN__)
entry.track = track;
entry.address_format = CDROM_MSF;
#endif
if ( ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1 )
{
Con_DPrintf("ioctl cdromreadtocentry failed\n");
return;
}
#ifdef __linux__
if (entry.cdte_ctrl == CDROM_DATA_TRACK)
#elif defined(__unix__) && !defined(__CYGWIN__)
if (entry.entry.control == CDROM_DATA_TRACK)
#endif
{
Con_Printf("CDAudio: track %i is not audio\n", track);
return;
}
#ifdef __linux__
ti.cdti_trk0 = track;
ti.cdti_trk1 = track;
ti.cdti_ind0 = 1;
ti.cdti_ind1 = 99;
#elif defined(__unix__) && !defined(__CYGWIN__)
if (ti.what.position.track_number == 0 || ti.what.position.track_number == 1)
{
entry.track = track;
}
if (ti.what.position.index_number == 0)
{
play.start_track = tochdr.starting_track;
}
if (ti.what.position.index_number == 1)
{
play.end_track = tochdr.ending_track;
}
#define CDROMPLAYTRKIND ti.what.position.track_number
#endif
if ( ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1 )
{
{
Con_DPrintf("ioctl cdromplaytrkind failed\n");
return;
}
}
if ( ioctl(cdfile, CDROMRESUME) == -1 )
Con_DPrintf("ioctl cdromresume failed\n");
@ -161,21 +243,42 @@ void CDAudio_Resume(void)
void CDAudio_Update(void)
{
#ifdef __linux__
struct cdrom_subchnl subchnl;
static time_t lastchk;
#elif defined(__unix__) && !defined(__CYGWIN__)
struct cd_sub_channel_info subchnl;
struct ioc_read_subchannel cdsc; // subchn.cdsc_format workaround - Brad
// Note: there doesn't seem to be a way to check how much time is left for playing
// cd audio without doing some extra manual work, so I'll be omitting it from
// the unix checks for the time being - Brad
#endif
if (playing && lastchk < time(NULL))
if (playing
#ifdef __linux__
&& lastchk < time(NULL)
#endif
)
{
#ifdef __linux__
lastchk = time(NULL) + 2; //two seconds between checks
subchnl.cdsc_format = CDROM_MSF;
#elif defined(__unix__) && !defined(__CYGWIN__)
cdsc.address_format = CDROM_MSF;
#endif
if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 )
{
Con_DPrintf("ioctl cdromsubchnl failed\n");
playing = false;
return;
}
#ifdef __linux__
if (subchnl.cdsc_audiostatus != CDROM_AUDIO_PLAY &&
subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED)
#elif defined(__unix__) && !defined(__CYGWIN__)
if (subchnl.header.audio_status != CDROM_AUDIO_PLAY &&
subchnl.header.audio_status != CDROM_AUDIO_PAUSED)
#endif
{
playing = false;
Media_EndedTrack();

65
engine/client/quakedef.h
View file

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//for msvc #pragma message lines
#if defined(_MSC_VER)
#define MSVC_LINE __FILE__"("STRINGIFY(__LINE__)"):"
#define MSVC_LINE __FILE__"("STRINGIFY(__LINE__)"):"
#define warningmsg(s) message(MSVC_LINE s)
#elif __GNUC__ >=4
#define warningmsg(s) message(s)
@ -50,37 +50,37 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#pragma warning( 2 : 4701)
#pragma warning(2:4132 4268)// const object not initialized
#pragma warning(2:4032) // function arg has different type from declaration
#pragma warning(2:4092) // 'sizeof' value too big
#pragma warning(2:4032) // function arg has different type from declaration
#pragma warning(2:4092) // 'sizeof' value too big
#pragma warning(2:4132 4268)// const object not initialized
//#pragma warning(2:4152) // pointer conversion between function and data
#pragma warning(2:4239) // standard doesn't allow this conversion
#pragma warning(2:4701) // local variable used without being initialized
//#pragma warning(2:4706) // if (a=b) instead of (if a==b)
#pragma warning(2:4709) // comma in array subscript
#pragma warning(3:4061) // not all enum values tested in switch statement
#pragma warning(3:4710) // inline function was not inlined
#pragma warning(3:4121) // space added for structure alignment
#pragma warning(3:4505) // unreferenced local function removed
#pragma warning(3:4019) // empty statement at global scope
//#pragma warning(3:4057) // pointers refer to different base types
#pragma warning(3:4125) // decimal digit terminates octal escape
#pragma warning(2:4131) // old-style function declarator
#pragma warning(3:4211) // extern redefined as static
//#pragma warning(3:4213) // cast on left side of = is non-standard
#pragma warning(3:4222) // member function at file scope shouldn't be static
//#pragma warning(2:4152) // pointer conversion between function and data
#pragma warning(2:4239) // standard doesn't allow this conversion
#pragma warning(2:4701) // local variable used without being initialized
//#pragma warning(2:4706) // if (a=b) instead of (if a==b)
#pragma warning(2:4709) // comma in array subscript
#pragma warning(3:4061) // not all enum values tested in switch statement
#pragma warning(3:4710) // inline function was not inlined
#pragma warning(3:4121) // space added for structure alignment
#pragma warning(3:4505) // unreferenced local function removed
#pragma warning(3:4019) // empty statement at global scope
//#pragma warning(3:4057) // pointers refer to different base types
#pragma warning(3:4125) // decimal digit terminates octal escape
#pragma warning(2:4131) // old-style function declarator
#pragma warning(3:4211) // extern redefined as static
//#pragma warning(3:4213) // cast on left side of = is non-standard
#pragma warning(3:4222) // member function at file scope shouldn't be static
#pragma warning(3:4234 4235)// keyword not supported or reserved for future
#pragma warning(3:4504) // type ambiguous; simplify code
#pragma warning(3:4507) // explicit linkage specified after default linkage
#pragma warning(3:4515) // namespace uses itself
#pragma warning(3:4504) // type ambiguous; simplify code
#pragma warning(3:4507) // explicit linkage specified after default linkage
#pragma warning(3:4515) // namespace uses itself
#pragma warning(3:4516 4517)// access declarations are deprecated
#pragma warning(3:4670) // base class of thrown object is inaccessible
#pragma warning(3:4671) // copy ctor of thrown object is inaccessible
#pragma warning(3:4673) // thrown object cannot be handled in catch block
#pragma warning(3:4674) // dtor of thrown object is inaccessible
#pragma warning(3:4705) // statement has no effect (example: a+1;)
#pragma warning(3:4670) // base class of thrown object is inaccessible
#pragma warning(3:4671) // copy ctor of thrown object is inaccessible
#pragma warning(3:4673) // thrown object cannot be handled in catch block
#pragma warning(3:4674) // dtor of thrown object is inaccessible
#pragma warning(3:4705) // statement has no effect (example: a+1;)
#pragma warning(3:4013) // function undefined, assuming extern returning int
#pragma warning(3:4013) // function undefined, assuming extern returning int
#pragma warning( 4 : 4267) //truncation from const double to float
@ -96,7 +96,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
#define QUAKEDEF_H__
#ifdef __linux__
@ -133,12 +132,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
#include <time.h>
#if defined(__unix__) && !defined(__CYGWIN__)
#include <sys/epoll.h>
#endif
#ifdef USE_MSVCRT_DEBUG
#define _CRTDBG_MAP_ALLOC
#include <crtdbg.h>
#endif
#if defined(_WIN32) || defined(__DJGPP__)
#include <malloc.h>
#elif defined(__unix__) && !defined(__linux__) // quick hack for the bsds and other unix systems
#include<stdlib.h>
#elif !defined(alloca) //alloca.h isn't present on bsd (stdlib.h should define it to __builtin_alloca, and we can check for that here).
#include <alloca.h>
#endif
@ -403,7 +408,7 @@ void COM_AssertMainThread(const char *msg);
#endif
extern qboolean msg_suppress_1; // suppresses resolution and cache size console output
// an fullscreen DIB focus gain/loss
// an fullscreen DIB focus gain/loss
#ifndef HAVE_CLIENT
#define isDedicated true

2
engine/client/snd_dma.c
View file

@ -1841,7 +1841,7 @@ extern sounddriver_t XAUDIO2_Output;
extern sounddriver_t DSOUND_Output;
#endif
sounddriver_t fte_weakstruct SDL_Output;
#ifdef __linux__
#if defined(__unix__) && !defined(__APPLE__) // Alsa, OSS and PulseAudio can all be installed on most Unixes these days; They can fall back to OSS_Output if needed - Brad
extern sounddriver_t ALSA_Output;
extern sounddriver_t Pulse_Output;
#endif

4
engine/client/sys_linux.c
View file

@ -66,6 +66,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#undef malloc
#if defined(__unix__) && !defined(__CYGWIN__)
#include <sys/epoll.h>
#endif
static int noconinput = 0;
static int nostdout = 0;

7
engine/common/console.h
View file

@ -21,6 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// console
//
// undefine this to solve build issues with epoll-shim - Brad
#if defined(__unix__) && !defined(__linux__) && !defined(__CYGWIN__)
#ifdef close
#undef close
#endif
#endif
#define MAXCONCOLOURS 16
typedef struct {
float fr, fg, fb;

6
engine/common/net_wins.c
View file

@ -26,6 +26,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <sys/stat.h> //to delete the file/socket.
#endif
#if defined(__unix__) && !defined(__linux__) && !defined(__APPLE__) && !defined(__CYGWIN__)
#include <sys/epoll.h>
#endif
extern ftemanifest_t *fs_manifest;
// Eww, eww. This is hacky but so is netinc.h, so bite me
@ -41,7 +45,7 @@ extern ftemanifest_t *fs_manifest;
#define ntohl BigLong
#endif
#if defined(_WIN32) || defined(__linux__) && !defined(ANDROID)
#if defined(_WIN32) || defined(__unix__) && !defined(ANDROID)
#define USE_GETHOSTNAME_LOCALLISTING
#endif

2
engine/common/netinc.h
View file

@ -140,7 +140,7 @@
#include <libc.h>
#endif
#ifdef __linux__
#if defined(__unix__) && !defined(__CYGWIN__)
//requires linux 2.6.27 up (and equivelent libc)
//note that BSD does tend to support the api, but emulated.
//this works around the select FD limit, and supposedly has better performance.

3
engine/http/iweb.h
View file

@ -36,6 +36,9 @@ struct sockaddr;
struct sockaddr_qstorage;
int NetadrToSockadr (netadr_t *a, struct sockaddr_qstorage *s);
#if defined(__unix__) && !defined(__CYGWIN__)
#include <sys/epoll.h>
#endif
typedef qboolean iwboolean;

2
engine/qclib/decomp.c
View file

@ -9,6 +9,8 @@
#if defined(_WIN32) || defined(__DJGPP__)
#include <malloc.h>
#elif defined(__unix__) && !defined(__linux__) // quick hack for the bsds and other unix systems
#include<stdlib.h>
#else
#include <alloca.h>
#endif

16
engine/qclib/pr_exec.c
View file

@ -12,6 +12,8 @@
#if defined(_WIN32) || defined(__DJGPP__)
#include <malloc.h>
#elif defined(__unix__) && !defined(__linux__) // quick hack for the bsds and other unix systems
#include<stdlib.h>
#elif !defined(alloca) //alloca.h isn't present on bsd (stdlib.h should define it to __builtin_alloca, and we can check for that here).
#include <alloca.h>
#endif
@ -361,9 +363,9 @@ static void PDECL PR_PrintRelevantLocals(progfuncs_t *progfuncs)
else
fdef = ED_FieldAtOfs(progfuncs, ((eval_t *)&pr_globals[st16[st].b])->_int);
if (fdef)
externs->Printf(" %s.%s: %s\n", PR_StringToNative(&progfuncs->funcs, ent->s_name), PR_StringToNative(&progfuncs->funcs, fld->s_name), PR_ValueString(progfuncs, fdef->type, ptr, false));
externs->Printf(" %s.%s: %s\n", PR_StringToNative(&progfuncs->funcs, ent->s_name), PR_StringToNative(&progfuncs->funcs, fld->s_name), PR_ValueString(progfuncs, fdef->type, ptr, false));
else
externs->Printf(" %s.%s: BAD FIELD DEF - %#x\n", PR_StringToNative(&progfuncs->funcs, ent->s_name), PR_StringToNative(&progfuncs->funcs, fld->s_name), ptr->_int);
externs->Printf(" %s.%s: BAD FIELD DEF - %#x\n", PR_StringToNative(&progfuncs->funcs, ent->s_name), PR_StringToNative(&progfuncs->funcs, fld->s_name), ptr->_int);
}
}
}
@ -452,20 +454,20 @@ void PDECL PR_StackTrace (pubprogfuncs_t *ppf, int showlocals)
{
if (f->parm_size[arg] == 3)
{ //looks like a vector. print it as such
externs->Printf(" arg%i(%i): [%g, %g, %g]\n", arg, f->parm_start+ofs, *(float *)(globalbase+ofs), *(float *)(globalbase+ofs+1), *(float *)(globalbase+ofs+2));
externs->Printf(" arg%i(%i): [%g, %g, %g]\n", arg, f->parm_start+ofs, *(float *)(globalbase+ofs), *(float *)(globalbase+ofs+1), *(float *)(globalbase+ofs+2));
ofs += 2;
}
else
externs->Printf(" arg%i(%i): %g===%i\n", arg, f->parm_start+ofs, *(float *)(globalbase+ofs), *(int *)(globalbase+ofs) );
externs->Printf(" arg%i(%i): %g===%i\n", arg, f->parm_start+ofs, *(float *)(globalbase+ofs), *(int *)(globalbase+ofs) );
}
else
{
externs->Printf(" unk(%i): %g===%i\n", f->parm_start+ofs, *(float *)(globalbase+ofs), *(int *)(globalbase+ofs) );
externs->Printf(" unk(%i): %g===%i\n", f->parm_start+ofs, *(float *)(globalbase+ofs), *(int *)(globalbase+ofs) );
}
}
else
{
externs->Printf(" %s: %s\n", PR_StringToNative(ppf, local->s_name), PR_ValueString(progfuncs, local->type, (eval_t*)(globalbase+ofs), false));
externs->Printf(" %s: %s\n", PR_StringToNative(ppf, local->s_name), PR_ValueString(progfuncs, local->type, (eval_t*)(globalbase+ofs), false));
if (local->type == ev_vector)
ofs+=2;
}
@ -2136,4 +2138,4 @@ pbool PDECL PR_GetBuiltinCallInfo (pubprogfuncs_t *ppf, int *builtinnum, char *f
return true;
}
return false;
}
}

2
engine/qclib/qcc_pr_comp.c
View file

@ -5,6 +5,8 @@
#if defined(_WIN32) || defined(__DJGPP__)
#include <malloc.h>
#elif defined(__unix__) && !defined(__linux__) // quick hack for the bsds and other unix systems
#include<stdlib.h>
#elif !defined(alloca) //alloca.h isn't present on bsd (stdlib.h should define it to __builtin_alloca, and we can check for that here).
#include <alloca.h>
#endif

2
engine/qclib/qccguistuff.c
View file

@ -7,6 +7,8 @@
#if defined(_WIN32) || defined(__DJGPP__)
#include <malloc.h>
#elif defined(__unix__) && !defined(__linux__) // quick hack for the bsds and other unix systems
#include<stdlib.h>
#else
#include <alloca.h>
#endif

2
fteqtv/qtv.h
View file

@ -157,7 +157,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define ioctlsocket ioctl
#define closesocket close
#elif defined(linux) || defined(ixemul) || defined(MACOSX) // I hope by adding MACOSX here it doesnt stop it from being natively built on macosx
#elif (defined(unix) && !defined(__CYGWIN__)) || defined(ixemul) // I hope by adding MACOSX here it doesnt stop it from being natively built on macosx
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>

1
plugins/plugin.c
View file

@ -305,4 +305,3 @@ qboolean NATIVEEXPORT FTEPlug_Init(plugcorefuncs_t *corefuncs)
return Plug_Init();
}

6
plugins/plugin.h
View file

@ -47,6 +47,12 @@
# define strnicmp strncasecmp
#endif
// Define these mostly for cod but could apply to other game tech
// Used this for guidance: https://github.com/xtnded/codextended - Brad
extern long xtn_LittleLong( long l );
extern short xtn_LittleShort( short s );
extern float xtn_LittleFloat( float f );
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>