From 1a4d78e41037337e9a0b4206fbef686db913237c Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Mon, 16 Sep 2002 06:17:12 +0000 Subject: [PATCH] - Removed OPENGL_CFLAGS and OPENGL_LIBS from the glx refresher target, as OpenGL is dynamically loaded at runtime by glx. --- src/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d0edf08..b03ecff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,8 +68,10 @@ quake2_LDADD = @PTHREAD_LIBS@ @LIBLTDL@ @OSS_LIBS@ -lm # ref_glx if BUILD_GLX ref_glx_la_SOURCES = $(REF_GL_COMMON) gl_glx.c -ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ @OPENGL_CFLAGS@ -ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @DL_LIBS@ +#ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ @OPENGL_CFLAGS@ +ref_glx_la_CFLAGS = $(std_cflags) -fPIC @X_CFLAGS@ +#ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @DL_LIBS@ +ref_glx_la_LDADD = @X_PRE_LIBS@ @X_LIBS@ @XTRA_LIBS@ @X_EXTRA_LIBS@ @DL_LIBS@ ref_glx_la_LDFLAGS = $(module_ldflags) endif @@ -85,7 +87,9 @@ endif if BUILD_SDLGL ref_sdlgl_la_SOURCES = $(REF_GL_COMMON) rw_sdl.c ref_sdlgl_la_CFLAGS = $(std_cflags) -fPIC -DOPENGL @SDL_CFLAGS@ @OPENGL_CFLAGS@ +#ref_sdlgl_la_CFLAGS = $(std_cflags) -fPIC -DOPENGL @SDL_CFLAGS@ ref_sdlgl_la_LDADD = @SDL_LIBS@ @OPENGL_LIBS@ +#ref_sdlgl_la_LDADD = @SDL_LIBS@ ref_sdlgl_la_LDFLAGS = $(module_ldflags) endif