From 04fc4656c928d58cdbbc60c605c5036564919ff4 Mon Sep 17 00:00:00 2001 From: tma Date: Tue, 28 Aug 2007 16:42:13 +0000 Subject: * Merge win_net.c and unix_net.c + Move win32/win_net.c to qcommon/net_ip.c and make it portable + Remove unix_net.c, but incorporate its revision history into win_net.c + Remove all IPX support -- this remains compatible with existing mods + This change also inadvertently gets us SOCKS support on non-Windows platforms git-svn-id: svn://svn.icculus.org/quake3/trunk@1139 edf5b092-35ff-0310-97b2-ce42778d08ea --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dc5b375..75f656b 100644 --- a/Makefile +++ b/Makefile @@ -828,6 +828,7 @@ release: targets: makedirs tools @echo "" @echo "Building ioquake3 in $(B):" + @echo " PLATFORM: $(PLATFORM)" @echo " ARCH: $(ARCH)" @echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)" @echo " COMPILE_ARCH: $(COMPILE_ARCH)" @@ -924,6 +925,7 @@ Q3OBJ = \ $(B)/client/md5.o \ $(B)/client/msg.o \ $(B)/client/net_chan.o \ + $(B)/client/net_ip.o \ $(B)/client/huffman.o \ \ $(B)/client/snd_adpcm.o \ @@ -1084,7 +1086,6 @@ ifeq ($(PLATFORM),mingw32) $(B)/client/win_glimp.o \ $(B)/client/win_input.o \ $(B)/client/win_main.o \ - $(B)/client/win_net.o \ $(B)/client/win_qgl.o \ $(B)/client/win_shared.o \ $(B)/client/win_snd.o \ @@ -1094,7 +1095,6 @@ ifeq ($(PLATFORM),mingw32) else Q3OBJ += \ $(B)/client/unix_main.o \ - $(B)/client/unix_net.o \ $(B)/client/unix_shared.o \ $(B)/client/linux_signals.o \ $(B)/client/linux_qgl.o \ @@ -1167,6 +1167,7 @@ Q3DOBJ = \ $(B)/ded/md4.o \ $(B)/ded/msg.o \ $(B)/ded/net_chan.o \ + $(B)/ded/net_ip.o \ $(B)/ded/huffman.o \ \ $(B)/ded/q_math.o \ @@ -1207,7 +1208,6 @@ Q3DOBJ = \ \ $(B)/ded/linux_signals.o \ $(B)/ded/unix_main.o \ - $(B)/ded/unix_net.o \ $(B)/ded/unix_shared.o \ \ $(B)/ded/null_client.o \ -- cgit v1.2.3