From acc0d2c5b814288fa43e94b21436fa0b79547864 Mon Sep 17 00:00:00 2001 From: Marcus Sundberg Date: Sat, 20 May 2000 01:15:14 +0000 Subject: [PATCH] Fixed up system driver selection. Made qf-server compile with Mingw32. --- source/Makefile.am | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/source/Makefile.am b/source/Makefile.am index 53b96c0..2b1ec8e 100644 --- a/source/Makefile.am +++ b/source/Makefile.am @@ -7,16 +7,24 @@ bin_PROGRAMS = @TARGETS@ EXTRA_PROGRAMS= qf-server qf-client-ggi qf-client-svga qf-client-x11 \ qf-client-glx +if SYSTYPE_WIN32 +cl_sys = sys_win.c cl_sys_win.c +sv_sys = sys_win.c sv_sys_win.c +else +cl_sys = sys_linux.c +sv_sys = sys_unix.c +endif + common_SOURCES= net_chan.c net_com.c net_udp.c pmove.c pmovetst.c zone.c \ mdfour.c mathlib.c math.S cvar.c crc.c common.c model.c cmd.c server_SOURCES= pr_cmds.c pr_edict.c pr_exec.c sv_init.c sv_main.c sv_misc.c \ sv_model.c sv_nchan.c sv_ents.c sv_send.c sv_move.c sv_phys.c \ - sv_user.c sv_ccmds.c world.c worlda.S sys_unix.c sv_cvar.c + sv_user.c sv_ccmds.c world.c worlda.S sv_cvar.c $(sv_sys) client_SOURCES= cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c cl_main.c \ cl_math.S cl_misc.c cl_parse.c cl_pred.c cl_tent.c cl_cam.c \ - snd_oss.c sys_linux.c cd_linux.c r_view.c wad.c snd_dma.c \ + snd_oss.c cd_linux.c r_view.c wad.c snd_dma.c \ snd_mem.c snd_mix.c snd_mixa.S skin.c sbar.c nonintel.c \ - menu.c keys.c console.c sys_x86.S cl_slist.c + menu.c keys.c console.c sys_x86.S cl_slist.c $(cl_sys) soft_SOURCES= cl_model.c cl_trans.c d_edge.c d_fill.c d_init.c d_modech.c \ d_part.c d_polyse.c d_scan.c d_sky.c d_sprite.c d_surf.c \ d_vars.c d_zpoint.c draw.c r_aclip.c r_alias.c r_bsp.c \ @@ -35,12 +43,16 @@ svga_SOURCES= vid_svgalib.c x11_SOURCES= vid_x11.c glx_SOURCES= vid_glx.c +EXTRA_qf_server_SOURCES= sys_linux.c sys_unix.c sys_win.c cl_sys_win.c \ + sv_sys_win.c + qf_server_SOURCES= $(common_SOURCES) $(server_SOURCES) qf_client_ggi_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(ggi_SOURCES) qf_client_svga_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(svga_SOURCES) qf_client_x11_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(x11_SOURCES) qf_client_glx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(glx_SOURCES) +LDADD = $(NET_LIBS) qf_client_ggi_LDADD= $(GGI_LIBS) qf_client_svga_LDADD= $(SVGA_LIBS) qf_client_x11_LDADD= $(X_PRE_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB)