From 2d90a24fbca97874117cd46efdcd38495096f16b Mon Sep 17 00:00:00 2001 From: Hexum Date: Mon, 29 Nov 2004 05:52:57 +0000 Subject: [PATCH] make it build on linux git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@539 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile.Linux | 4 ++++ engine/client/render.h | 2 +- engine/gl/gl_alias.c | 2 +- engine/gl/gl_vidlinuxglx.c | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/Makefile.Linux b/engine/Makefile.Linux index c6206eab7..998ad3584 100644 --- a/engine/Makefile.Linux +++ b/engine/Makefile.Linux @@ -106,6 +106,7 @@ CLIENT_OBJS = \ $(OUT_DIR)/m_x.o \ $(OUT_DIR)/x_reqs.o \ $(OUT_DIR)/x_res.o \ + $(OUT_DIR)/pr_menu.o \ #\ # $(OUT_DIR)/sys_dosa.o SOFTWARE_OBJS = \ @@ -658,6 +659,9 @@ $(OUT_DIR)/roq_read.o : $(CLIENT_DIR)/roq_read.c $(OUT_DIR)/clq2_cin.o : $(CLIENT_DIR)/clq2_cin.c $(DO_CC) +$(OUT_DIR)/pr_menu.o : $(CLIENT_DIR)/pr_menu.c + $(DO_CC) + $(OUT_DIR)/m_options.o : $(CLIENT_DIR)/m_options.c $(DO_CC) diff --git a/engine/client/render.h b/engine/client/render.h index 7579aebb6..6d4367054 100644 --- a/engine/client/render.h +++ b/engine/client/render.h @@ -278,7 +278,7 @@ void R_Part_SkyTri(float *v1, float *v2, float *v3, struct msurface_s *surf); void R_ClearParticles (void); void R_Part_NewServer(void); int ParticleTypeForName(char *name); -void R_SetRenderer(r_qrenderer_t wanted); +void R_SetRenderer(int wanted); void R_DrawParticles (void); void R_InitParticles (void); void RQ_Init(void); diff --git a/engine/gl/gl_alias.c b/engine/gl/gl_alias.c index cc1852867..975603323 100644 --- a/engine/gl/gl_alias.c +++ b/engine/gl/gl_alias.c @@ -2595,7 +2595,7 @@ typedef struct { void GL_LoadQ3Model(model_t *mod, void *buffer) { - extern qboolean gl_bumpmappingpossible; + extern int gl_bumpmappingpossible; int hunkstart, hunkend, hunktotal; // int version; int s, i, j, d; diff --git a/engine/gl/gl_vidlinuxglx.c b/engine/gl/gl_vidlinuxglx.c index 778ef2dae..e613e9b61 100644 --- a/engine/gl/gl_vidlinuxglx.c +++ b/engine/gl/gl_vidlinuxglx.c @@ -893,3 +893,5 @@ void GLVID_LockBuffer() {} int GLVID_ForceUnlockedAndReturnState (void) {return 0;} void GLVID_ForceLockState (int lk) {} void GLVID_HandlePause (qboolean pause) {} + +void GL_DoSwap(void) {}