Build qw-client-glslx too.

I was asked about timedemo overkill (bigass1 currently gets 40kfps, haha),
so I had to add qw-client-glslx to the build.
This commit is contained in:
Bill Currie 2011-12-25 16:41:14 +09:00
parent 9df7370bcd
commit 55a0ed49cd
3 changed files with 52 additions and 5 deletions

View file

@ -76,9 +76,9 @@ if test "x$HAVE_X" = xyes; then
QF_NEED(console, [client])
fi
if test "x$ENABLE_clients_glslx" = xyes; then
#QW_TARGETS="$QW_TARGETS qw-client-glslx\$(EXEEXT)"
QW_TARGETS="$QW_TARGETS qw-client-glslx\$(EXEEXT)"
NQ_TARGETS="$NQ_TARGETS nq-glslx\$(EXEEXT)"
#QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-glx.desktop"
QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-glx.desktop"
NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-glslx.desktop"
CL_TARGETS="$CL_TARGETS GLSLX"
VID_TARGETS="$VID_TARGETS libQFglslx.la"

View file

@ -41,6 +41,7 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$";
#endif
#include "QF/cvar.h"
#include "QF/image.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/skin.h"
@ -96,6 +97,19 @@ R_Particles_Init_Cvars (void)
{
}
VISIBLE void
R_Particle_New (ptype_t type, int texnum, const vec3_t org, float scale,
const vec3_t vel, float die, int color, float alpha, float ramp)
{
}
VISIBLE void
R_Particle_NewRandom (ptype_t type, int texnum, const vec3_t org, int org_fuzz,
float scale, int vel_fuzz, float die, int color,
float alpha, float ramp)
{
}
VISIBLE void
R_ClearParticles (void)
{
@ -131,11 +145,21 @@ Fog_ParseWorldspawn (struct plitem_s *worldspawn)
{
}
VISIBLE void
Skin_Player_Model (model_t *model)
{
}
VISIBLE void
Skin_Set_Translate (int top, int bottom, void *_dest)
{
}
VISIBLE void
Skin_Do_Translation (skin_t *player_skin, int slot, skin_t *skin)
{
}
VISIBLE void
Skin_Do_Translation_Model (struct model_s *model, int skinnum, int slot,
skin_t *skin)
@ -301,6 +325,12 @@ R_InitParticles (void)
R_GrenadeTrail = grenade_trail;
}
VISIBLE tex_t *
SCR_ScreenShot (int width, int height)
{
return 0;
}
VISIBLE void
SCR_ScreenShot_f (void)
{

View file

@ -36,9 +36,9 @@ AM_CFLAGS= @PTHREAD_CFLAGS@
bin_PROGRAMS= @QW_TARGETS@
EXTRA_PROGRAMS= qw-client-fbdev qw-client-glx qw-client-mgl qw-client-sdl \
qw-client-sdl32 qw-client-sgl qw-client-svga qw-client-3dfx \
qw-client-wgl qw-client-x11 qw-server qw-master
EXTRA_PROGRAMS= qw-client-fbdev qw-client-glx qw-client-glslx qw-client-mgl \
qw-client-sdl qw-client-sdl32 qw-client-sgl qw-client-svga \
qw-client-3dfx qw-client-wgl qw-client-x11 qw-server qw-master
noinst_LIBRARIES= @qw_libs@
EXTRA_LIBRARIES=libqw_client.a libqw_common.a libqw_sdl.a libqw_server.a
@ -200,6 +200,9 @@ qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
opengl_LIBS= $(top_builddir)/libs/video/renderer/libQFrenderer_gl.la \
$(top_builddir)/libs/models/libQFmodels_gl.la
glsl_LIBS= $(top_builddir)/libs/video/renderer/libQFrenderer_glsl.la \
$(top_builddir)/libs/models/libQFmodels_glsl.la
# ... OpenGL in X Window
qw_client_glx_libs= \
$(client_libs) \
@ -214,6 +217,20 @@ qw_client_glx_LDADD= $(qw_client_glx_libs) \
qw_client_glx_LDFLAGS= $(common_ldflags)
qw_client_glx_DEPENDENCIES= $(qw_client_glx_libs)
# ... OpenGLSL in X Window
qw_client_glslx_libs= \
$(client_libs) \
$(cl_plugin_LIBS) \
$(glsl_LIBS) \
$(top_builddir)/libs/video/targets/libQFglslx.la \
$(client_LIBS)
qw_client_glslx_SOURCES= cl_sys_unix.c
qw_client_glslx_LDADD= $(qw_client_glslx_libs) \
$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-lXext $(X_EXTRA_LIBS) $(DL_LIBS) $(NET_LIBS) $(LIBCURL)
qw_client_glslx_LDFLAGS= $(common_ldflags)
qw_client_glslx_DEPENDENCIES= $(qw_client_glslx_libs)
# ... Linux 3DFX
qw_client_3dfx_libs= \
$(client_libs) \