From fca1bc312880d5952e3606552ae650fc6854d435 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 22 Jan 2001 15:50:21 +0000 Subject: [PATCH] configuration fixes --- configure | 2 +- main/Makefile.am | 17 +++++++++++------ main/Makefile.in | 10 +++++++--- video/Makefile.am | 4 ++-- video/Makefile.in | 10 +++++----- video/ogl_gr.c | 32 ++++++++++++++++---------------- 6 files changed, 42 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 6e951a60..5b7639f8 100644 --- a/configure +++ b/configure @@ -21,7 +21,7 @@ ac_help="$ac_help ac_help="$ac_help --with-opengl Build OpenGL support " ac_help="$ac_help - --with-ggi Build GGI suuport " + --with-ggi Build GGI support " ac_help="$ac_help --with-svga Build SVGALib support " ac_help="$ac_help diff --git a/main/Makefile.am b/main/Makefile.am index c332324f..0484fbfb 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -23,14 +23,19 @@ d2x_LDFLAGS = -export-dynamic if ENV_DJGPP d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../video/libvideo.a ../arch/libarch.a ../sound/libsound.a ../input/libinput.a -else -if USE_OPENGL - d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -lSDL -ldl -lpthread -lGL -lGLU -lgii -L/usr/X11R6/lib -lXext else + d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -ldl -lpthread ${SDL_LIBS} + +if USE_OPENGL + d2x_LDADD += ${OGL_LIBS} -lgii -L/usr/X11R6/lib -lXext +endif + if USE_SVGALIB - d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -lSDL -ldl -lpthread ${SVGA_LIBS} -else - d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -lSDL -ldl -lpthread + d2x_LDADD += ${SVGA_LIBS} endif + +if USE_GGI + d2x_LDADD += ${GGI_LIBS} endif + endif diff --git a/main/Makefile.in b/main/Makefile.in index 448269cc..8db1d76b 100644 --- a/main/Makefile.in +++ b/main/Makefile.in @@ -343,9 +343,13 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean @ENV_DJGPP_TRUE@ d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../video/libvideo.a ../arch/libarch.a ../sound/libsound.a ../input/libinput.a -@ENV_DJGPP_FALSE@@USE_OPENGL_TRUE@ d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -lSDL -ldl -lpthread -lGL -lGLU -lgii -L/usr/X11R6/lib -lXext -@ENV_DJGPP_FALSE@@USE_OPENGL_FALSE@@USE_SVGALIB_TRUE@ d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -lSDL -ldl -lpthread ${SVGA_LIBS} -@ENV_DJGPP_FALSE@@USE_OPENGL_FALSE@@USE_SVGALIB_FALSE@ d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -lSDL -ldl -lpthread +@ENV_DJGPP_FALSE@ d2x_LDADD = ../3d/lib3d.a ../2d/lib2d.a ../mem/libmem.a ../cfile/libcfile.a ../iff/libiff.a ../texmap/libtexmap.a ../misc/libmisc.a ../maths/libmaths.a ../arch/libarch.a ../video/libvideo.a ../sound/libsound.a ../input/libinput.a -lm -ldl -lpthread ${SDL_LIBS} + +@ENV_DJGPP_FALSE@@USE_OPENGL_TRUE@ d2x_LDADD += ${OGL_LIBS} -lgii -L/usr/X11R6/lib -lXext + +@ENV_DJGPP_FALSE@@USE_SVGALIB_TRUE@ d2x_LDADD += ${SVGA_LIBS} + +@ENV_DJGPP_FALSE@@USE_GGI_TRUE@ d2x_LDADD += ${GGI_LIBS} # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/video/Makefile.am b/video/Makefile.am index 144c3f6c..3c1aecc5 100644 --- a/video/Makefile.am +++ b/video/Makefile.am @@ -1,4 +1,4 @@ noinst_LIBRARIES = libvideo.a -INCLUDES = -I $(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main -I../input/ggi/include +INCLUDES = -I $(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main libvideo_a_SOURCES = ogl.c ogl_glx.c ogl_gr.c \ -sdl_gr.c dos_gr.c svgalib_gr.c +sdl_gr.c dos_gr.c svgalib_gr.c ggi_gr.c diff --git a/video/Makefile.in b/video/Makefile.in index 935bc96c..1ac8fca3 100644 --- a/video/Makefile.in +++ b/video/Makefile.in @@ -72,8 +72,8 @@ SVGA_LIBS = @SVGA_LIBS@ VERSION = @VERSION@ noinst_LIBRARIES = libvideo.a -INCLUDES = -I $(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main -I../input/ggi/include -libvideo_a_SOURCES = ogl.c ogl_glx.c ogl_gr.c sdl_gr.c dos_gr.c svgalib_gr.c +INCLUDES = -I $(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main +libvideo_a_SOURCES = ogl.c ogl_glx.c ogl_gr.c sdl_gr.c dos_gr.c svgalib_gr.c ggi_gr.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../conf.h @@ -87,7 +87,7 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libvideo_a_LIBADD = libvideo_a_OBJECTS = ogl.o ogl_glx.o ogl_gr.o sdl_gr.o dos_gr.o \ -svgalib_gr.o +svgalib_gr.o ggi_gr.o AR = ar COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -99,8 +99,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best -DEP_FILES = .deps/dos_gr.P .deps/ogl.P .deps/ogl_glx.P .deps/ogl_gr.P \ -.deps/sdl_gr.P .deps/svgalib_gr.P +DEP_FILES = .deps/dos_gr.P .deps/ggi_gr.P .deps/ogl.P .deps/ogl_glx.P \ +.deps/ogl_gr.P .deps/sdl_gr.P .deps/svgalib_gr.P SOURCES = $(libvideo_a_SOURCES) OBJECTS = $(libvideo_a_OBJECTS) diff --git a/video/ogl_gr.c b/video/ogl_gr.c index 9ed996ae..8277aed8 100644 --- a/video/ogl_gr.c +++ b/video/ogl_gr.c @@ -135,16 +135,16 @@ void ogl_get_verinfo(void){ } //allow overriding of stuff. - if ((t=FindArg("-gl_intensity4_ok"))){ + if ((t=args_find("-gl_intensity4_ok"))){ ogl_intensity4_ok=atoi(Args[t+1]); } - if ((t=FindArg("-gl_luminance4_alpha4_ok"))){ + if ((t=args_find("-gl_luminance4_alpha4_ok"))){ ogl_luminance4_alpha4_ok=atoi(Args[t+1]); } - if ((t=FindArg("-gl_rgba2_ok"))){ + if ((t=args_find("-gl_rgba2_ok"))){ ogl_rgba2_ok=atoi(Args[t+1]); } - if ((t=FindArg("-gl_readpixels_ok"))){ + if ((t=args_find("-gl_readpixels_ok"))){ ogl_readpixels_ok=atoi(Args[t+1]); } @@ -240,7 +240,7 @@ int ogl_init_load_library(void) int retcode=0; if (!ogl_rt_loaded){ int t; - if ((t=FindArg("-gl_library"))) + if ((t=args_find("-gl_library"))) OglLibPath=Args[t+1]; retcode = OpenGL_LoadLibrary(true); @@ -275,48 +275,48 @@ int gr_init() #endif #ifdef GR_SUPPORTS_FULLSCREEN_TOGGLE - if (FindArg("-gl_voodoo")){ + if (args_find("-gl_voodoo")){ ogl_voodoohack=1; gr_toggle_fullscreen(); } - if (FindArg("-fullscreen")) + if (args_find("-fullscreen")) gr_toggle_fullscreen(); #endif - if ((glt=FindArg("-gl_alttexmerge"))) + if ((glt=args_find("-gl_alttexmerge"))) ogl_alttexmerge=1; - if ((t=FindArg("-gl_stdtexmerge"))) + if ((t=args_find("-gl_stdtexmerge"))) if (t>=glt)//allow overriding of earlier args ogl_alttexmerge=0; - if ((glt=FindArg("-gl_16bittextures"))) + if ((glt=args_find("-gl_16bittextures"))) ogl_rgba_format=GL_RGB5_A1; - if ((glt=FindArg("-gl_mipmap"))){ + if ((glt=args_find("-gl_mipmap"))){ GL_texmagfilt=GL_LINEAR; GL_texminfilt=GL_LINEAR_MIPMAP_NEAREST; } - if ((t=FindArg("-gl_simple"))){ + if ((t=args_find("-gl_simple"))){ if (t>=glt){//allow overriding of earlier args glt=t; GL_texmagfilt=GL_NEAREST; GL_texminfilt=GL_NEAREST; } } - if ((t=FindArg("-gl_texmagfilt")) || (t=FindArg("-gl_texmagfilter"))){ + if ((t=args_find("-gl_texmagfilt")) || (t=args_find("-gl_texmagfilter"))){ if (t>=glt)//allow overriding of earlier args GL_texmagfilt=ogl_atotexfilti(Args[t+1],0); } - if ((t=FindArg("-gl_texminfilt")) || (t=FindArg("-gl_texminfilter"))){ + if ((t=args_find("-gl_texminfilt")) || (t=args_find("-gl_texminfilter"))){ if (t>=glt)//allow overriding of earlier args GL_texminfilt=ogl_atotexfilti(Args[t+1],1); } GL_needmipmaps=ogl_testneedmipmaps(GL_texminfilt); mprintf((0,"gr_init: texmagfilt:%x texminfilt:%x needmipmaps=%i\n",GL_texmagfilt,GL_texminfilt,GL_needmipmaps)); - if ((t=FindArg("-gl_vidmem"))){ + if ((t=args_find("-gl_vidmem"))){ ogl_mem_target=atoi(Args[t+1])*1024*1024; } - if ((t=FindArg("-gl_reticle"))){ + if ((t=args_find("-gl_reticle"))){ gl_reticle=atoi(Args[t+1]); } //printf("ogl_mem_target=%i\n",ogl_mem_target); -- 2.39.2