qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-24 21:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged duplicate client/server functions (placed into PMOVETST.C).

Browse source 
Client now uses WORLDA.S (renamed func)
This commit is contained in:
Dabb 2001-03-05 11:53:02 +00:00
parent a033a03624
commit 89dd78e5fe
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/Makefile.am
View file

@ -48,11 +48,12 @@ endif
if ASM_ARCH if ASM_ARCH
math_ASM = math.S sys_x86.S math_ASM = math.S sys_x86.S
world_ASM= worlda.S
endif endif
common_SOURCES= buildnum.c checksum.c cmd.c com.c crc.c cvar.c hash.c \ common_SOURCES= buildnum.c checksum.c cmd.c com.c crc.c cvar.c hash.c \
info.c link.c mathlib.c mdfour.c model.c model_brush.c \ info.c link.c mathlib.c mdfour.c model.c model_brush.c \
msg.c pmove.c pmovetst.c qargs.c qendian.c quakefs.c quakeio.c \ msg.c pmove.c pmovetst.c qargs.c qendian.c quakefs.c quakeio.c \
sizebuf.c va.c zone.c $(math_ASM) $(packetlogger) sizebuf.c va.c zone.c $(math_ASM) $(packetlogger) $(world_ASM)
# #
# ... Network type # ... Network type
@ -76,14 +77,10 @@ libqfsys_sv_a_SOURCES= sv_sys_unix.c sys_unix.c
endif endif
EXTRA_libqfsys_sv_a_SOURCES= fnmatch.c dirent.c sv_sys_unix.c sv_sys_win.c sys_unix.c sys_win.c EXTRA_libqfsys_sv_a_SOURCES= fnmatch.c dirent.c sv_sys_unix.c sv_sys_win.c sys_unix.c sys_win.c
if ASM_ARCH
world_ASM= worlda.S
endif
server_SOURCES= pr_edict.c pr_exec.c pr_offs.c sv_ccmds.c sv_cvar.c \ server_SOURCES= pr_edict.c pr_exec.c pr_offs.c sv_ccmds.c sv_cvar.c \
sv_ents.c sv_init.c sv_main.c sv_misc.c sv_model.c \ sv_ents.c sv_init.c sv_main.c sv_misc.c sv_model.c \
sv_move.c sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \ sv_move.c sv_nchan.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_send.c \
sv_user.c ver_check.c world.c $(world_ASM) sv_user.c ver_check.c world.c
qf_server_SOURCES= $(common_SOURCES) $(server_SOURCES) qf_server_SOURCES= $(common_SOURCES) $(server_SOURCES)
qf_server_LDADD= -L. -lqfnet -lqfsys_sv $(NET_LIBS) $(Z_LIBS) $(DL_LIBS) qf_server_LDADD= -L. -lqfnet -lqfsys_sv $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)

27
source/makefile.mgw
View file

@ -54,14 +54,15 @@ qf_server_PROGRAM = qfserver.exe
# #
#!if ASM_ARCH #!if ASM_ARCH
#math_ASM = math.S sys_x86.S math_ASM = math.S sys_x86.S
world_ASM = worlda.S
#!endif #!endif
common_SOURCES= buildnum.c checksum.c cmd.c com.c crc.c cvar.c info.c link.c \ common_SOURCES= buildnum.c checksum.c cmd.c com.c crc.c cvar.c info.c link.c \
locs.c mathlib.c mdfour.c model.c model_brush.c msg.c \ locs.c mathlib.c mdfour.c model.c model_brush.c msg.c \
net_chan.c net_com.c net_udp.c pmove.c pmovetst.c qargs.c \ net_chan.c net_com.c net_udp.c pmove.c pmovetst.c qargs.c \
qendian.c quakefs.c quakeio.c sizebuf.c va.c zone.c hash.c \ qendian.c quakefs.c quakeio.c sizebuf.c va.c zone.c hash.c \
$(math_ASM) $(math_ASM) $(world_ASM)
sound_SOURCES= snd_dma.c snd_mem.c snd_mix.c sound_SOURCES= snd_dma.c snd_mem.c snd_mix.c
@ -76,7 +77,7 @@ WIN32_OTHER = cd_win.c joy_win.c in_win.c
# Client itself # Client itself
# #
#if ASM_ARCH #if ASM_ARCH
#client_ASM= snd_mixa.S cl_math.S client_ASM= snd_mixa.S cl_math.S
#endif #endif
client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \ client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
@ -117,16 +118,12 @@ soft_SOURCES= sw_skin.c d_edge.c d_fill.c d_init.c d_modech.c \
# #
# #
#if ASM_ARCH
#world_ASM = worlda.S
#endif
server_SYS = fnmatch.c dirent.c sv_sys_win.c sys_win.c server_SYS = fnmatch.c dirent.c sv_sys_win.c sys_win.c
server_SOURCES= sv_pr_cmds.c pr_edict.c pr_exec.c pr_offs.c sv_ccmds.c sv_cvar.c \ server_SOURCES= sv_pr_cmds.c pr_edict.c pr_exec.c pr_offs.c sv_ccmds.c sv_cvar.c \
sv_ents.c sv_init.c sv_main.c sv_misc.c sv_model.c \ sv_ents.c sv_init.c sv_main.c sv_misc.c sv_model.c \
sv_move.c sv_nchan.c sv_phys.c sv_send.c sv_user.c \ sv_move.c sv_nchan.c sv_phys.c sv_send.c sv_user.c \
ver_check.c world.c sv_progs.c $(world_ASM) ver_check.c world.c sv_progs.c
# Microsoft Opengl Win32 # Microsoft Opengl Win32
@ -169,9 +166,8 @@ qf_server_SOURCES = $(common_SOURCES) $(server_SOURCES) $(server_SYS)
# #
# #
DEFS = -DHAVE_CONFIG_H=1 -D_WINDOWS=1 -DWINDOWS=1 -D_WIN32=1 -DWIN32=1 -DHAVE_FNMATCH_H=1 DEFS = -DHAVE_CONFIG_H=1 -D_WINDOWS=1 -DWINDOWS=1 -D_WIN32=1 -DWIN32=1 -DHAVE_FNMATCH_H=1 -DUSE_INTEL_ASM=1
#-DHAVE_MGRAPH_H=1
#-DUSE_INTEL_ASM=1
# For Pentium Pro and higher # For Pentium Pro and higher
#MACHINEDEPOPTS = -mpentiumpro -march=pentiumpro -malign-loops=2 -malign-jumps=2 -malign-functions=2 #MACHINEDEPOPTS = -mpentiumpro -march=pentiumpro -malign-loops=2 -malign-jumps=2 -malign-functions=2
@ -197,6 +193,8 @@ qf_server_LIBS = $(common_libs)
QFINCLUDES = -I$(QFROOT)\include\win32\mingw -I$(QFROOT)\include\win32 -I$(QFROOT)\include -L. -I$(QFROOT)\include\win32\resources QFINCLUDES = -I$(QFROOT)\include\win32\mingw -I$(QFROOT)\include\win32 -I$(QFROOT)\include -L. -I$(QFROOT)\include\win32\resources
OTHERINCLUDES = -I$(DIRECTXSDK)\includes -I$(ZLIB) OTHERINCLUDES = -I$(DIRECTXSDK)\includes -I$(ZLIB)
#-ID:\scitech\include
CFLAGS = -I$(SDLSDK)\include $(QFINCLUDES) $(OTHERINCLUDES) $(COPTS) $(DEFS) CFLAGS = -I$(SDLSDK)\include $(QFINCLUDES) $(OTHERINCLUDES) $(COPTS) $(DEFS)
qf_client_wgl_OBJECTS = $(qf_client_wgl_SOURCES:.c=.o) qf_client_wgl_OBJECTS = $(qf_client_wgl_SOURCES:.c=.o)
@ -230,8 +228,9 @@ qf-server: $(qf_server_OBJECTS)
clean: clean:
rm -f $(PROGRAM) $(OBJECTS) rm -f $(PROGRAM) $(OBJECTS)
# compile is not supported yet, probs with MGLFX # compile is not supported yet, probs with MGLFX -Xlinker --verbose
#qf-client-win: $(qf_client_win_OBJECTS) #qf-client-win: $(qf_client_win_OBJECTS)
# gcc -Xlinker --verbose $(CFLAGS) -ID:\scitech\includes -o $(qf_client_win_PROGRAM) $(qf_client_win_OBJECTS) $(qf_client_win_LIBS) -mwindows # gcc $(CFLAGS) -o $(qf_client_win_PROGRAM) $(qf_client_win_OBJECTS) $(qf_client_win_LIBS) -mwindows
# strip --strip-all $(qf_client_win_PROGRAM) # strip --strip-all $(qf_client_win_PROGRAM)