qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

nq-wgl tries to build, but ld segs :(

Browse source
This commit is contained in:
Bill Currie 2001-04-11 05:23:12 +00:00
parent 4ae2ad2949
commit 47d89d73c2
2 changed files with 7 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nq/source/Makefile.am
View file

@ -38,7 +38,7 @@ bin_PROGRAMS = @NQ_TARGETS@
EXTRA_PROGRAMS= nq-3dfx nq-fbdev nq-glx nq-mgl nq-sdl \
nq-sgl nq-svga nq-wgl nq-x11 nq-server
noinst_LIBRARIES= libqfsys.a libqfjs.a libqfnet.a
noinst_LIBRARIES= libqfjs.a libqfnet.a
#if ASM_ARCH
math_ASM= cl_math.S
@ -57,11 +57,10 @@ common_SOURCES= game.c wad.c world.c \
# ... System type
#
if SYSTYPE_WIN32
libqfsys_a_SOURCES= sys_win.c fnmatch.c
qfsys_SRC= sys_win.c fnmatch.c
else
libqfsys_a_SOURCES= sys_unix.c
qfsys_SRC= sys_unix.c
endif
EXTRA_libqfsys_a_SOURCES= dirent.c fnmatch.c sys_unix.c sys_win.c
#
# ... Joystick
@ -88,8 +87,8 @@ client_LIBS= $(top_builddir)/libs/gamecode/libQFgamecode.la \
$(top_builddir)/libs/util/libQFutil.la \
$(top_builddir)/libs/audio/cd/libQFcd.la \
$(top_builddir)/libs/audio/targets/libQFsound.la \
-L. -lqfsys -lqfjs -lqfnet $(SOUND_LIBS) $(NET_LIBS)
client_LIB_DEPS= libqfsys.a libqfjs.a libqfnet.a
-L. -lqfjs -lqfnet $(SOUND_LIBS) $(NET_LIBS)
client_LIB_DEPS= libqfjs.a libqfnet.a
client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
cl_tent.c console.c keys.c sbar.c r_part.c r_view.c \
@ -100,7 +99,7 @@ server_SOURCES= host.c host_cmd.c \
pr_cmds.c \
sv_cvar.c sv_main.c sv_move.c sv_phys.c sv_progs.c sv_user.c
combined_SOURCES= $(common_SOURCES) $(client_SOURCES) $(server_SOURCES)
combined_SOURCES= $(common_SOURCES) $(client_SOURCES) $(server_SOURCES) $(qfsys_SRC)
#
# Software-rendering targets
@ -228,7 +227,7 @@ nq_server_DEPENDENCIES=libqfnet.a
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
# or it won't be distributed with 'make dist'
#
EXTRA_DIST= #nq.dsp
EXTRA_DIST= #nq.dsp dirent.c fnmatch.c sys_unix.c sys_win.c
# Kill the temp files, hopefully.
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)

59
nq/source/sys_win.c
View file

@ -338,65 +338,6 @@ Sys_Quit (void)
}
/*
================
Sys_DoubleTime
================
*/
double
Sys_DoubleTime (void)
{
static int sametimecount;
static unsigned int oldtime;
static int first = 1;
LARGE_INTEGER PerformanceCount;
unsigned int temp, t2;
double time;
Sys_PushFPCW_SetHigh ();
QueryPerformanceCounter (&PerformanceCount);
temp = ((unsigned int) PerformanceCount.LowPart >> lowshift) |
((unsigned int) PerformanceCount.HighPart << (32 - lowshift));
if (first) {
oldtime = temp;
first = 0;
} else {
// check for turnover or backward time
if ((temp <= oldtime) && ((oldtime - temp) < 0x10000000)) {
oldtime = temp; // so we can't get stuck
} else {
t2 = temp - oldtime;
time = (double) t2 *pfreq;
oldtime = temp;
curtime += time;
if (curtime == lastcurtime) {
sametimecount++;
if (sametimecount > 100000) {
curtime += 1.0;
sametimecount = 0;
}
} else {
sametimecount = 0;
}
lastcurtime = curtime;
}
}
Sys_PopFPCW ();
return curtime;
}
/*
================
Sys_InitFloatTime