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

compile fixes from Artur Frysiak <wiget@pld.org.pl>

Browse source
This commit is contained in:
Bill Currie 2001-06-05 17:23:03 +00:00
parent 4a0d453b48
commit 735a35b2f9
9 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -634,7 +634,7 @@ else
fi fi
if test "x$HAVE_GLX" = xyes; then if test "x$HAVE_GLX" = xyes; then
test "x$GLX_CFLAGS" != x && GLX_CFLAGS="-I$GLX_CFLAGS" test "x$glx_includes" != x && GLX_CFLAGS="-I$glx_includes"
test "x$glx_libraries" != x && GLX_LIBS="-L$glx_libraries" test "x$glx_libraries" != x && GLX_LIBS="-L$glx_libraries"
GLX_LIBS="$GLX_LIBS -l$OGL_NAME" GLX_LIBS="$GLX_LIBS -l$OGL_NAME"
AC_DEFINE(HAVE_GLX) AC_DEFINE(HAVE_GLX)

1
libs/models/Makefile.am
View file

@ -3,6 +3,7 @@ INCLUDES= -I$(top_srcdir)/include
if BUILD_GL if BUILD_GL
MODELS_GL = libQFmodels_gl.la MODELS_GL = libQFmodels_gl.la
AM_CFLAGS = $(GLX_CFLAGS)
else else
MODELS_GL = MODELS_GL =
endif endif

1
libs/models/alias/Makefile.am
View file

@ -2,6 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
if BUILD_GL if BUILD_GL
ALIAS_GL = libalias_gl.la ALIAS_GL = libalias_gl.la
AM_CFLAGS = $(GLX_CFLAGS)
else else
ALIAS_GL = ALIAS_GL =
endif endif

1
libs/models/brush/Makefile.am
View file

@ -2,6 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
if BUILD_GL if BUILD_GL
BRUSH_GL = libbrush_gl.la BRUSH_GL = libbrush_gl.la
AM_CFLAGS = $(GLX_CFLAGS)
else else
BRUSH_GL = BRUSH_GL =
endif endif

1
libs/models/sprite/Makefile.am
View file

@ -2,6 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
if BUILD_GL if BUILD_GL
SPRITE_GL = libsprite_gl.la SPRITE_GL = libsprite_gl.la
AM_CFLAGS = $(GLX_CFLAGS)
else else
SPRITE_GL = SPRITE_GL =
endif endif

1
libs/video/renderer/gl/Makefile.am
View file

@ -2,6 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
if BUILD_GL if BUILD_GL
GL = libgl.la GL = libgl.la
AM_CFLAGS = $(GLX_CFLAGS)
else else
GL = GL =
endif endif

4
nq/source/Makefile.am
View file

@ -81,6 +81,10 @@ server_SOURCES= host.c host_cmd.c pr_cmds.c sv_cvar.c sv_main.c \
combined_SOURCES= $(common_SOURCES) $(client_SOURCES) $(server_SOURCES) \ combined_SOURCES= $(common_SOURCES) $(client_SOURCES) $(server_SOURCES) \
$(qfsys_SRC) $(qfsys_SRC)
if BUILD_GL
AM_CFLAGS = $(GLX_CFLAGS)
endif
# Software-rendering targets # Software-rendering targets
# #
# ... Common stuff # ... Common stuff

4
qw/source/Makefile.am
View file

@ -103,6 +103,10 @@ client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
r_view.c sbar.c skin.c teamplay.c \ r_view.c sbar.c skin.c teamplay.c \
$(syscl_SRC) $(syscl_SRC)
if BUILD_GL
AM_CFLAGS = $(GLX_CFLAGS)
endif
# Software-rendering clients # Software-rendering clients
# #
# ... Common stuff # ... Common stuff

2
qw/source/net_udp6.c
View file

@ -105,7 +105,9 @@
#ifdef __GLIBC__ // glibc macro #ifdef __GLIBC__ // glibc macro
# define s6_addr32 in6_u.u6_addr32 # define s6_addr32 in6_u.u6_addr32
# if ! __GLIBC_PREREQ (2,2)
# define ss_family __ss_family # define ss_family __ss_family
# endif
#endif #endif
netadr_t net_local_adr; netadr_t net_local_adr;