Leak_Technologies/HULL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge identical tr_subs.c into renderercommon

Browse Source
This commit is contained in:
Tim Angus 2025-08-01 20:21:10 +01:00
parent 9dfe9d6a6a
commit 92fb145f43
3 changed files with 8 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -2081,10 +2081,10 @@ ifneq ($(USE_RENDERER_DLOPEN), 0)
$(B)/renderergl1/tr_subs.o $(B)/renderergl1/tr_subs.o
Q3R2OBJ += \ Q3R2OBJ += \
$(B)/renderergl1/q_shared.o \ $(B)/renderergl2/q_shared.o \
$(B)/renderergl1/puff.o \ $(B)/renderergl2/puff.o \
$(B)/renderergl1/q_math.o \ $(B)/renderergl2/q_math.o \
$(B)/renderergl1/tr_subs.o $(B)/renderergl2/tr_subs.o
endif endif
ifneq ($(USE_INTERNAL_JPEG),0) ifneq ($(USE_INTERNAL_JPEG),0)
@ -2937,6 +2937,9 @@ $(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl $(STRINGIFY)
$(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c $(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c
$(DO_REF_CC) $(DO_REF_CC)
$(B)/renderergl2/%.o: $(CMDIR)/%.c
$(DO_REF_CC)
$(B)/renderergl2/%.o: $(RCOMMONDIR)/%.c $(B)/renderergl2/%.o: $(RCOMMONDIR)/%.c
$(DO_REF_CC) $(DO_REF_CC)

2
code/renderergl1/tr_subs.c → code/renderercommon/tr_subs.c
View File

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
// tr_subs.c - common function replacements for modular renderer // tr_subs.c - common function replacements for modular renderer
#include "tr_local.h" #include "tr_common.h"
void QDECL Com_Printf( const char *msg, ... ) void QDECL Com_Printf( const char *msg, ... )
{ {

48
code/renderergl2/tr_subs.c
View File

@ -1,48 +0,0 @@
/*
===========================================================================
Copyright (C) 2010 James Canete (use.less01@gmail.com)
This file is part of Quake III Arena source code.
Quake III Arena source code is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
Quake III Arena source code is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Quake III Arena source code; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
// tr_subs.c - common function replacements for modular renderer
#include "tr_local.h"
void QDECL Com_Printf( const char *msg, ... )
{
va_list argptr;
char text[1024];
va_start(argptr, msg);
Q_vsnprintf(text, sizeof(text), msg, argptr);
va_end(argptr);
ri.Printf(PRINT_ALL, "%s", text);
}
void QDECL Com_Error( int level, const char *error, ... )
{
va_list argptr;
char text[1024];
va_start(argptr, error);
Q_vsnprintf(text, sizeof(text), error, argptr);
va_end(argptr);
ri.Error(level, "%s", text);
}