mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-02-21 11:11:37 +00:00
compile fixes from Artur Frysiak <wiget@pld.org.pl>
This commit is contained in:
parent
4a0d453b48
commit
735a35b2f9
9 changed files with 16 additions and 1 deletions
|
@ -634,7 +634,7 @@ else
|
|||
fi
|
||||
|
||||
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"
|
||||
GLX_LIBS="$GLX_LIBS -l$OGL_NAME"
|
||||
AC_DEFINE(HAVE_GLX)
|
||||
|
|
|
@ -3,6 +3,7 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
if BUILD_GL
|
||||
MODELS_GL = libQFmodels_gl.la
|
||||
AM_CFLAGS = $(GLX_CFLAGS)
|
||||
else
|
||||
MODELS_GL =
|
||||
endif
|
||||
|
|
|
@ -2,6 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
if BUILD_GL
|
||||
ALIAS_GL = libalias_gl.la
|
||||
AM_CFLAGS = $(GLX_CFLAGS)
|
||||
else
|
||||
ALIAS_GL =
|
||||
endif
|
||||
|
|
|
@ -2,6 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
if BUILD_GL
|
||||
BRUSH_GL = libbrush_gl.la
|
||||
AM_CFLAGS = $(GLX_CFLAGS)
|
||||
else
|
||||
BRUSH_GL =
|
||||
endif
|
||||
|
|
|
@ -2,6 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
if BUILD_GL
|
||||
SPRITE_GL = libsprite_gl.la
|
||||
AM_CFLAGS = $(GLX_CFLAGS)
|
||||
else
|
||||
SPRITE_GL =
|
||||
endif
|
||||
|
|
|
@ -2,6 +2,7 @@ INCLUDES= -I$(top_srcdir)/include
|
|||
|
||||
if BUILD_GL
|
||||
GL = libgl.la
|
||||
AM_CFLAGS = $(GLX_CFLAGS)
|
||||
else
|
||||
GL =
|
||||
endif
|
||||
|
|
|
@ -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) \
|
||||
$(qfsys_SRC)
|
||||
|
||||
if BUILD_GL
|
||||
AM_CFLAGS = $(GLX_CFLAGS)
|
||||
endif
|
||||
|
||||
# Software-rendering targets
|
||||
#
|
||||
# ... Common stuff
|
||||
|
|
|
@ -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 \
|
||||
$(syscl_SRC)
|
||||
|
||||
if BUILD_GL
|
||||
AM_CFLAGS = $(GLX_CFLAGS)
|
||||
endif
|
||||
|
||||
# Software-rendering clients
|
||||
#
|
||||
# ... Common stuff
|
||||
|
|
|
@ -105,7 +105,9 @@
|
|||
|
||||
#ifdef __GLIBC__ // glibc macro
|
||||
# define s6_addr32 in6_u.u6_addr32
|
||||
# if ! __GLIBC_PREREQ (2,2)
|
||||
# define ss_family __ss_family
|
||||
# endif
|
||||
#endif
|
||||
|
||||
netadr_t net_local_adr;
|
||||
|
|
Loading…
Reference in a new issue