qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-03-22 08:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile.in: Removed -lvga from in_x11.so build

Browse source 
rest: misc. fixes
This commit is contained in:
Jeff Teunissen 2000-02-15 19:25:09 +00:00
parent b03c0a094e
commit 1bf5d6c30c
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/Makefile.in
View file

@ -190,7 +190,7 @@ IN_X11_OBJS = $(BUILD_DIR)/input_libs/in_x11.@OBJEXT@
$(IN_X11_LIB): in_input_DIR $(TARGET_DIR)/$(IN_X11_LIB)
$(TARGET_DIR)/$(IN_X11_LIB): $(IN_X11_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -lvga -shared -rdynamic -o $@ $(IN_X11_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ $(IN_X11_OBJS)
endif

22
common/gl_vidglx.c
View file

@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdlib.h>
#include <ctype.h>
#include <signal.h>
#include <plugin.h>
#ifdef HAVE_DLFCN_H
# include <dlfcn.h>
@ -575,9 +574,6 @@ void VID_Init(unsigned char *palette)
Window root;
XVisualInfo *visinfo;
plugin_load("./in_x11.so");
IN->Init();
S_Init();
Cvar_RegisterVariable(&vid_mode);
@ -608,19 +604,17 @@ void VID_Init(unsigned char *palette)
vid.conwidth = width;
vid.conwidth &= 0xfff8; // make it a multiple of eight
if (vid.conwidth < 320)
vid.conwidth = 320;
vid.conwidth = min(vid.conwidth, 320);
// pick a conheight that matches with correct aspect
vid.conheight = vid.conwidth*3 / 4;
vid.conheight = vid.conwidth * 3 / 4;
if ((i = COM_CheckParm("-conheight")) != 0)
vid.conheight = Q_atoi(com_argv[i+1]);
if (vid.conheight < 200)
vid.conheight = 200;
i = COM_CheckParm ("-conheight");
if ( i != 0 ) // Set console height, but no smaller than 200 px
vid.conheight = min(Q_atoi(com_argv[i+1]), 200);
if (!(dpy = XOpenDisplay(NULL))) {
dpy = XOpenDisplay(NULL);
if ( !dpy ) {
fprintf(stderr, "Error couldn't open the X display\n");
exit(1);
}
@ -719,7 +713,7 @@ void VID_Init(unsigned char *palette)
GL_Init();
snprintf(gldir, sizeof(gldir), "%s/OpenGL", com_gamedir);
snprintf(gldir, sizeof(gldir), "%s/glquake", com_gamedir);
Sys_mkdir (gldir);
VID_SetPalette(palette);

2
common/in_x11.c
View file

@ -143,7 +143,7 @@ static int X_IN_Init (unsigned char *palette)
verbose=COM_CheckParm("-verbose");
// open the display
x_disp = XOpenDisplay(0);
x_disp = XOpenDisplay(NULL);
if (!x_disp)
{
if (getenv("DISPLAY"))

2
common/vid_x11.c
View file

@ -465,7 +465,7 @@ ResetSharedFrameBuffers(void)
// the palette data will go away after the call, so it must be copied off if
// the video driver will need it again
void VID_Init (unsigned char *palette)
void VID_Init (unsigned char *palette)
{
int pnum, i;
XVisualInfo template;