nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-18 09:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some compile issues.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5595 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-12-17 19:21:29 +00:00
parent d16c6646b7
commit 40ce444015
3 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
engine/client/snd_al.c
View file

@ -50,34 +50,35 @@ We also have no doppler with WebAudio.
#define AL_APIENTRY #define AL_APIENTRY
#endif #endif
#define palGetError alGetError #define palGetError alGetError
#define palSourcef alSourcef #define palSourcef alSourcef
#define palSourcei alSourcei #define palSourcei alSourcei
#define palSourcePlayv alSourcePlayv #define palSourcePlayv alSourcePlayv
#define palSourceStopv alSourceStopv #define palSourceStopv alSourceStopv
#define palSourcePlay alSourcePlay #define palSourcePlay alSourcePlay
#define palSourceStop alSourceStop #define palSourceStop alSourceStop
#define palDopplerFactor alDopplerFactor #define palDopplerFactor alDopplerFactor
#define palGenBuffers alGenBuffers #define palGenBuffers alGenBuffers
#define palIsBuffer alIsBuffer #define palIsBuffer alIsBuffer
#define palBufferData alBufferData #define palBufferData alBufferData
#define palDeleteBuffers alDeleteBuffers #define palDeleteBuffers alDeleteBuffers
#define palListenerfv alListenerfv #define palListenerfv alListenerfv
#define palSourcefv alSourcefv #define palSourcefv alSourcefv
#define palGetString alGetString #define palGetString alGetString
#define palGenSources alGenSources #define palGenSources alGenSources
#define palListenerf alListenerf #define palIsSource alIsSource
#define palDeleteBuffers alDeleteBuffers #define palListenerf alListenerf
#define palDeleteSources alDeleteSources #define palDeleteBuffers alDeleteBuffers
#define palSpeedOfSound alSpeedOfSound #define palDeleteSources alDeleteSources
#define palDistanceModel alDistanceModel #define palSpeedOfSound alSpeedOfSound
#define palGetSourcei alGetSourcei #define palDistanceModel alDistanceModel
#define palGetSourcei alGetSourcei
#define palSourceQueueBuffers alSourceQueueBuffers #define palSourceQueueBuffers alSourceQueueBuffers
#define palSourceUnqueueBuffers alSourceUnqueueBuffers #define palSourceUnqueueBuffers alSourceUnqueueBuffers
#define palcOpenDevice alcOpenDevice #define palcOpenDevice alcOpenDevice
#define palcCloseDevice alcCloseDevice #define palcCloseDevice alcCloseDevice
#define palcCreateContext alcCreateContext #define palcCreateContext alcCreateContext
#define palcDestroyContext alcDestroyContext #define palcDestroyContext alcDestroyContext
#define palcMakeContextCurrent alcMakeContextCurrent #define palcMakeContextCurrent alcMakeContextCurrent

2
imgtool.c
View file

@ -266,7 +266,9 @@ void QDECL Q_strncpyz(char *d, const char *s, int n)
void VARGS Q_vsnprintfz (char *dest, size_t size, const char *fmt, va_list argptr) void VARGS Q_vsnprintfz (char *dest, size_t size, const char *fmt, va_list argptr)
{ {
#ifdef _WIN32 #ifdef _WIN32
#undef _vsnprintf
_vsnprintf (dest, size, fmt, argptr); _vsnprintf (dest, size, fmt, argptr);
#define _vsnprintf unsafe_vsnprintf
#else #else
#ifdef _DEBUG #ifdef _DEBUG
if ((size_t)vsnprintf (dest, size, fmt, argptr) > size-1) if ((size_t)vsnprintf (dest, size, fmt, argptr) > size-1)

5
plugins/avplug/avencode.c
View file

@ -824,9 +824,9 @@ qboolean AVEnc_Init(void)
ffmpeg_format_force = cvarfuncs->GetNVFDG(ENCODERNAME"_format_force", "", 0, "Forces the output container format. If blank, will guess based upon filename extension.", ENCODERNAME); ffmpeg_format_force = cvarfuncs->GetNVFDG(ENCODERNAME"_format_force", "", 0, "Forces the output container format. If blank, will guess based upon filename extension.", ENCODERNAME);
ffmpeg_videocodec = cvarfuncs->GetNVFDG(ENCODERNAME"_videocodec", "", 0, "Forces which video encoder to use. If blank, guesses based upon container defaults.\nCommon names are libx264 (software), x264_nvenc (hardware accelerated)", ENCODERNAME); ffmpeg_videocodec = cvarfuncs->GetNVFDG(ENCODERNAME"_videocodec", "", 0, "Forces which video encoder to use. If blank, guesses based upon container defaults.\nCommon names are libx264 (software), x264_nvenc (hardware accelerated)", ENCODERNAME);
ffmpeg_videobitrate = cvarfuncs->GetNVFDG(ENCODERNAME"_videobitrate", "", 0, "Specifies the target video bitrate", ENCODERNAME); ffmpeg_videobitrate = cvarfuncs->GetNVFDG(ENCODERNAME"_videobitrate", "", 0, "Specifies the target video bitrate", ENCODERNAME);
ffmpeg_videoforcewidth = cvarfuncs->GetNVFDG(ENCODERNAME"_videoforcewidth", "", 0, "Rescales the input video width. Best to leave blank in order to record the video at the native resolution.", ENCODERNAME); ffmpeg_videoforcewidth = cvarfuncs->GetNVFDG(ENCODERNAME"_videoforcewidth", "", 0, "Rescales the input video width. Best to leave blank in order to record the video at the native resolution.", ENCODERNAME);
ffmpeg_videoforceheight = cvarfuncs->GetNVFDG(ENCODERNAME"_videoforceheight", "", 0, "Rescales the input video height. Best to leave blank in order to record the video at the native resolution.", ENCODERNAME); ffmpeg_videoforceheight = cvarfuncs->GetNVFDG(ENCODERNAME"_videoforceheight", "", 0, "Rescales the input video height. Best to leave blank in order to record the video at the native resolution.", ENCODERNAME);
ffmpeg_videopreset = cvarfuncs->GetNVFDG(ENCODERNAME"_videopreset", "veryfast", 0, "Specifies which codec preset to use, for codecs that support such presets.", ENCODERNAME); ffmpeg_videopreset = cvarfuncs->GetNVFDG(ENCODERNAME"_videopreset", "veryfast", 0, "Specifies which codec preset to use, for codecs that support such presets.", ENCODERNAME);
ffmpeg_video_crf = cvarfuncs->GetNVFDG(ENCODERNAME"_video_crf", "", 0, "Specifies the 'Constant Rate Factor' codec setting.\nA value of 0 is 'lossless', a value of 51 is 'worst quality posible', a value of 23 is default.", ENCODERNAME); ffmpeg_video_crf = cvarfuncs->GetNVFDG(ENCODERNAME"_video_crf", "", 0, "Specifies the 'Constant Rate Factor' codec setting.\nA value of 0 is 'lossless', a value of 51 is 'worst quality posible', a value of 23 is default.", ENCODERNAME);
ffmpeg_audiocodec = cvarfuncs->GetNVFDG(ENCODERNAME"_audiocodec", "", 0, "Forces which audio encoder to use. If blank, guesses based upon container defaults.", ENCODERNAME); ffmpeg_audiocodec = cvarfuncs->GetNVFDG(ENCODERNAME"_audiocodec", "", 0, "Forces which audio encoder to use. If blank, guesses based upon container defaults.", ENCODERNAME);
ffmpeg_audiobitrate = cvarfuncs->GetNVFDG(ENCODERNAME"_audiobitrate", "", 0, "Specifies the target audio bitrate", ENCODERNAME); ffmpeg_audiobitrate = cvarfuncs->GetNVFDG(ENCODERNAME"_audiobitrate", "", 0, "Specifies the target audio bitrate", ENCODERNAME);
@ -835,6 +835,7 @@ qboolean AVEnc_Init(void)
{ {
// cmdfuncs->AddCommand(ENCODERNAME"_configure"); // cmdfuncs->AddCommand(ENCODERNAME"_configure");
cmdfuncs->AddCommand(ENCODERNAME"_nvidia"); cmdfuncs->AddCommand(ENCODERNAME"_nvidia");
cmdfuncs->AddCommand(ENCODERNAME"_defaults");
} }
return true; return true;