Build GLSL clients for SDL.

Just about to do a release, and I realized windows users wouldn't have any
way of checking out the new renderer. I'll add wglsl when I get a chance to
do some testing.

config.d/build_control.m4

@@ -5,7 +5,7 @@ dnl ==================================================================
 QF_WITH_TARGETS(
 	clients,
 	[  --with-clients=<list>   compile clients in <list>:],
-	[3dfx,fbdev,glx,glslx,mgl,sdl,sdl32,sgl,svga,wgl,x11],dummy
+	[3dfx,fbdev,glx,glslx,mgl,sdl,sdl32,sgl,sglsl,svga,wgl,x11],dummy
 )
 QF_WITH_TARGETS(
 	servers,
@@ -159,6 +159,20 @@ if test "x$HAVE_SDL" = xyes; then
 		QF_NEED(nq, [client common sdl])
 		QF_NEED(console, [client])
 	fi
+	if test "x$ENABLE_clients_sglsl" = xyes; then
+		QW_TARGETS="$QW_TARGETS qw-client-sglsl\$(EXEEXT)"
+		NQ_TARGETS="$NQ_TARGETS nq-sglsl\$(EXEEXT)"
+		QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-sglsl.desktop"
+		NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sglsl.desktop"
+		CL_TARGETS="$CL_TARGETS SDL-GLSL"
+		VID_TARGETS="$VID_TARGETS libQFsglsl.la"
+		BUILD_GLSL=yes
+		CAN_BUILD_GLSL=yes
+		QF_NEED(vid, [common sdl glsl])
+		QF_NEED(qw, [client common sdl])
+		QF_NEED(nq, [client common sdl])
+		QF_NEED(console, [client])
+	fi
 fi
 if test "x$HAVE_SVGA" = xyes; then
 	if test "x$ENABLE_clients_svga" = xyes; then

libs/video/targets/Makefile.am

@@ -18,8 +18,9 @@ noinst_LTLIBRARIES= @VID_TARGETS@ @vid_libs@
 EXTRA_LTLIBRARIES= \
 	libQFjs.la libQFfbdev.la libQFglx.la libQFglslx.la libQFsvga.la \
 	libQFtdfx.la libQFx11.la libQFsdl.la libQFsdl32.la libQFsgl.la \
-	libQFwgl.la libvid_asm.la libvid_common.la libvid_gl.la libvid_glsl.la \
-	libvid_sdl.la libvid_sw.la libvid_sw32.la libvid_svga.la libvid_x11.la
+	libQFsglsl.la libQFwgl.la \
+	libvid_asm.la libvid_common.la libvid_gl.la libvid_glsl.la libvid_sdl.la \
+	libvid_sw.la libvid_sw32.la libvid_svga.la libvid_x11.la
 
 libvid_asm_la_SOURCES=		d_copy.S
 libvid_asm_la_CFLAGS=		@PREFER_NON_PIC@
@@ -139,6 +140,13 @@ libQFsgl_la_LDFLAGS=		@STATIC@
 libQFsgl_la_LIBADD=			$(sgl_libs)
 libQFsgl_la_DEPENDENCIES=	$(sgl_libs)
 
+sglsl_libs=libvid_common.la libvid_glsl.la libvid_sdl.la
+libQFsglsl_la_CFLAGS=		@PREFER_NON_PIC@ $(SDL_CFLAGS)
+libQFsglsl_la_SOURCES=		vid_sgl.c
+libQFsglsl_la_LDFLAGS=		@STATIC@
+libQFsglsl_la_LIBADD=		$(sglsl_libs)
+libQFsglsl_la_DEPENDENCIES=	$(sglsl_libs)
+
 #
 # SVGAlib
 #

nq/source/Makefile.am

@@ -37,7 +37,7 @@ AM_CFLAGS= @PTHREAD_CFLAGS@
 bin_PROGRAMS=	@NQ_TARGETS@
 
 EXTRA_PROGRAMS= nq-fbdev nq-glx nq-glslx nq-mgl nq-sdl nq-sdl32 nq-sgl \
-		nq-svga nq-3dfx nq-wgl nq-x11 nq-server
+		nq-sglsl nq-svga nq-3dfx nq-wgl nq-x11 nq-server
 
 noinst_LIBRARIES= @nq_libs@
 EXTRA_LIBRARIES=libnq_client.a libnq_common.a libnq_sdl.a libnq_server.a
@@ -231,6 +231,19 @@ nq_sgl_LDADD=		$(nq_sgl_libs) $(SDL_LIBS) $(DL_LIBS) $(NET_LIBS)
 nq_sgl_LDFLAGS= 	$(common_ldflags)
 nq_sgl_DEPENDENCIES=	$(nq_sgl_libs)
 
+# ... Simple Directmedia Layer, version 1.2 and higher, in GLSL mode
+nq_sglsl_libs=  \
+			libnq_sdl.a \
+			$(client_libs) \
+			$(cl_plugin_LIBS) \
+			$(glsl_QFLIBS) \
+			$(top_builddir)/libs/video/targets/libQFsglsl.la \
+			$(client_LIBS)
+nq_sglsl_SOURCES=sdl_link.c
+nq_sglsl_LDADD=		$(nq_sglsl_libs) $(SDL_LIBS) $(DL_LIBS) $(NET_LIBS)
+nq_sglsl_LDFLAGS= 	$(common_ldflags)
+nq_sglsl_DEPENDENCIES=	$(nq_sglsl_libs)
+
 # ... SGI/Microsoft WGL (Windows OpenGL)
 nq_wgl_libs=  \
 			$(client_libs) \

qw/source/Makefile.am

@@ -37,8 +37,9 @@ AM_CFLAGS= @PTHREAD_CFLAGS@
 bin_PROGRAMS=	@QW_TARGETS@
 
 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
+		qw-client-sdl qw-client-sdl32 qw-client-sgl qw-client-sglsl \
+		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
@@ -261,6 +262,19 @@ qw_client_sgl_LDADD= $(qw_client_sgl_libs) $(SDL_LIBS) $(DL_LIBS) $(NET_LIBS) $(
 qw_client_sgl_LDFLAGS=  $(common_ldflags)
 qw_client_sgl_DEPENDENCIES= $(qw_client_sgl_libs)
 
+# ... Simple DirectMedia Layer, version 1.2 and higher, in GLSL mode
+qw_client_sglsl_libs= \
+			libqw_sdl.a \
+			$(client_libs) \
+			$(cl_plugin_LIBS) \
+			$(glsl_LIBS) \
+			$(top_builddir)/libs/video/targets/libQFsglsl.la \
+			$(client_LIBS)
+qw_client_sglsl_SOURCES=sdl_link.c
+qw_client_sglsl_LDADD= $(qw_client_sglsl_libs) $(SDL_LIBS) $(DL_LIBS) $(NET_LIBS) $(LIBCURL_LIBS)
+qw_client_sglsl_LDFLAGS=  $(common_ldflags)
+qw_client_sglsl_DEPENDENCIES= $(qw_client_sglsl_libs)
+
 # ... SGI/Microsoft WGL (Windows OpenGL)
 qw_client_wgl_libs= \
 			$(client_libs) \

tools/build_scripts/qf-win32.py

@@ -46,6 +46,16 @@ client_sgl = [
 	dir + "QF/menu.plist",
 ]
 
+client_sglsl = [
+	dir,
+	dir + "bin",
+	dir + "bin/nq-sglsl.exe",
+	dir + "bin/qw-client-sglsl.exe",
+	dir + "QF",
+	dir + "QF/menu.dat.gz",
+	dir + "QF/menu.plist",
+]
+
 client_sdl = [
 	dir,
 	dir + "bin",
@@ -107,6 +117,7 @@ packages = [
 	(prefix + "-" + "server", server),
 	(prefix + "-" + "client-wgl", client_wgl),
 	(prefix + "-" + "client-sgl", client_sgl),
+	(prefix + "-" + "client-sglsl", client_sglsl),
 	(prefix + "-" + "client-sdl", client_sdl),
 	(prefix + "-" + "client-sdl32", client_sdl32),
 	(prefix + "-" + "tools", tools),