qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-30 00:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleaned up the build system...thanks to some configure hacking, -glx is

Browse source 
now only built if X11 is available, and defines its own CFLAGS and LIBS
variables to be empty if dirs are not specified on the
configure command-line.

Oh, yeah. OPENGL_* are now GLX_*. Sorry. :)
This commit is contained in:
Jeff Teunissen 2000-05-18 13:15:10 +00:00
parent 39d627ef10
commit 00aa3557d4
3 changed files with 154 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
INCLUDES= -I$(top_srcdir)/include @OPENGL_INCLUDES@ $(X_CFLAGS)
INCLUDES= $(GGI_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS)
bin_PROGRAMS = @TARGETS@
@ -41,10 +41,9 @@ qf_client_svga_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(sv
qf_client_x11_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(x11_SOURCES)
qf_client_glx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(glx_SOURCES)
qf_client_svga_LDADD= @SVGA_LIBS@
qf_client_x11_LDADD= @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lX11 @X_SHM_LIB@
qf_client_glx_LDADD= @OPENGL_LIBS@
qf_client_ggi_LDADD= @GGI_LIBS@
qf_client_svga_LDADD= $(SVGA_LIBS)
qf_client_x11_LDADD= $(X_PRE_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB)
qf_client_glx_LDADD= $(GLX_LIBS) $(X_PRE_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
EXTRA_DIST = makefile.winc makefile.wingl makefile.wins \
qw_client.dsp qw_server.dsp