qf
/
quakeforge-old
mirror of https://git.code.sf.net/p/quake/quakeforge-old
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.in - let autoconf tell us how to do shared library stuff 

cvar.c - added $include <stdlib.h>
in_x11.c - removed #include "menu.h" (unavailable in some cases & unneeded)
vid_sunx.c - now loads x11 plugin
world.c - only call SV_Error if compiling uquake or qw-server
This commit is contained in:
Loring Holden 2000-02-17 16:18:55 +00:00
parent 7d387042f7
commit 1b7369d462
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/Makefile.in
View File

@ -163,7 +163,7 @@ sound_lib_DIR:
$(SOUND_LIB): sound_lib_DIR $(TARGET_DIR)/sound_lib.a
$(TARGET_DIR)/sound_lib.a: $(SOUND_LIB_OBJS)
#gcc -Wall -shared -o $@ $(SOUND_LIB_OBJS)
#gcc -Wall @SHARED@ -o $@ $(SOUND_LIB_OBJS)
ar cru $@ $(SOUND_LIB_OBJS)
@RANLIB@ $@
@ -179,8 +179,7 @@ IN_SVGALIB_OBJS = $(BUILD_DIR)/input_libs/in_svgalib.@OBJEXT@
$(IN_SVGALIB_LIB): in_input_DIR $(TARGET_DIR)/$(IN_SVGALIB_LIB)
$(TARGET_DIR)/$(IN_SVGALIB_LIB): $(IN_SVGALIB_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -lvga -shared -rdynamic -o $@ $(IN_SVGALIB_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) @SHARED@ -o $@ @USE_SHARED_LIBS@ $(IN_SVGALIB_OBJS)
endif
ifneq ($(IN_X11_LIB),)
@ -190,8 +189,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) -shared -rdynamic -o $@ $(IN_X11_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) @SHARED@ @USE_SHARED_LIBS@ -o $@ $(IN_X11_OBJS)
endif
###########################################################################

1
common/cvar.c
View File

@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <console.h>
#include <cmd.h>
#include <client.h>
#include <stdlib.h>
#ifdef UQUAKE
#include <server.h>
#endif

1
common/in_x11.c
View File

@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <sound.h>
#include <keys.h>
#include <cvar.h>
#include <menu.h>
#include <sys.h>
#include <cmd.h>
#include <lib_replace.h>

3
common/vid_sunx.c
View File

@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <common.h>
#include <sys.h>
#include <client.h>
#include <plugin.h>
cvar_t _windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE};
cvar_t m_filter = {"m_filter","0", CVAR_ARCHIVE};
@ -534,6 +535,8 @@ void VID_Init (unsigned char *palette)
int num_visuals;
int template_mask;
plugin_load("in_x11.so");
IN->Init();
S_Init(); // sound is initialized here
Cmd_AddCommand("gamma", VID_Gamma_f);

8
common/world.c
View File

@ -31,6 +31,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <server.h>
#include <world.h>
#if !defined(SERVERONLY) && !defined(UQUAKE)
#define SV_Error Sys_Error
#endif
/*
entities never clip against themselves, or their owner
@ -617,11 +621,7 @@ qboolean SV_RecursiveHullCheck (hull_t *hull, int num, float p1f, float p2f, vec
}
if (num < hull->firstclipnode || num > hull->lastclipnode) {
#if defined(SERVERONLY) || defined(UQUAKE)
SV_Error ("SV_RecursiveHullCheck: bad node number");
#else
Sys_Error ("SV_RecursiveHullCheck: bad node number");
#endif
}
//