qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-20 01:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build and ignore cleanups

Browse source 
GLSL renderer build was checking for BUILD_GL instead of BUILD_GLSL in a
few places. Also, ignore the GLSL .fc and .vc files and the binaries.
This commit is contained in:
Jeff Teunissen 2012-01-02 14:16:19 -05:00
parent 2a3151cecd
commit 86edf54c40
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -182,6 +182,10 @@ core
/libs/video/renderer/gl/fbset_modes_y.[ch]
/libs/video/renderer/gl/fbset_modes_l.c
# /libs/video/renderer/glsl/
/libs/video/renderer/glsl/*.fc
/libs/video/renderer/glsl/*.vc
# /libs/video/renderer/sw/
/libs/video/renderer/sw/fbset_modes_y.[ch]
/libs/video/renderer/sw/fbset_modes_l.c
@ -213,6 +217,7 @@ core
/nq/source/fbset_modes_y.h
/nq/source/nq-3dfx
/nq/source/nq-fbdev
/nq/source/nq-glslx
/nq/source/nq-glx
/nq/source/nq-sdl
/nq/source/nq-sdl32
@ -256,6 +261,7 @@ core
/qw/source/qw-client-3dfx
/qw/source/qw-client-fbdev
/qw/source/qw-client-glx
/qw/source/qw-client-glslx
/qw/source/qw-client-sdl
/qw/source/qw-client-sdl32
/qw/source/qw-client-sgl

2
config.d/build_control.m4
View file

@ -297,7 +297,7 @@ if test "x$BUILD_GL" = xyes; then
VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_gl.la"
VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_gl.la"
fi
if test "x$BUILD_GL" = xyes; then
if test "x$BUILD_GLSL" = xyes; then
VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_glsl.la"
VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_glsl.la"
fi

2
libs/video/renderer/glsl/Makefile.am
View file

@ -14,7 +14,7 @@ glsl_src = \
glsl_alias.c glsl_draw.c glsl_main.c glsl_particles.c glsl_screen.c \
glsl_sprite.c glsl_textures.c
if BUILD_GL
if BUILD_GLSL
noinst_LTLIBRARIES= libglsl.la
BUILT_SOURCES= $(shader_gen)
else