diff --git a/ctf/q_shared.h b/ctf/q_shared.h
index 08b5286..b10b741 100644
--- a/ctf/q_shared.h
+++ b/ctf/q_shared.h
@@ -39,11 +39,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdlib.h>
 #include <time.h>
 
-//#if (defined _M_IX86 || defined __i386__) && !defined C_ONLY && !defined __sun__
-//#define id386	1
-//#else
+#if (defined _M_IX86 || defined __i386__) && !defined C_ONLY && !defined __sun__
+#define id386	1
+#else
 #define id386	0
-//#endif
+#endif
 
 #if defined _M_ALPHA && !defined C_ONLY
 #define idaxp	1
diff --git a/game/q_shared.h b/game/q_shared.h
index 08b5286..b10b741 100644
--- a/game/q_shared.h
+++ b/game/q_shared.h
@@ -39,11 +39,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <stdlib.h>
 #include <time.h>
 
-//#if (defined _M_IX86 || defined __i386__) && !defined C_ONLY && !defined __sun__
-//#define id386	1
-//#else
+#if (defined _M_IX86 || defined __i386__) && !defined C_ONLY && !defined __sun__
+#define id386	1
+#else
 #define id386	0
-//#endif
+#endif
 
 #if defined _M_ALPHA && !defined C_ONLY
 #define idaxp	1
diff --git a/linux/Makefile b/linux/Makefile
index 78da39b..87a8c58 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -61,11 +61,11 @@ DO_SHLIB_AS=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -DELF -x assembler-with-cpp -o $@ -c
 
 TARGETS=$(BUILDDIR)/quake2 \
 	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
-	$(BUILDDIR)/ref_softx.$(SHLIBEXT) \
-	$(BUILDDIR)/ref_gl.$(SHLIBEXT) \
-	$(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
+	$(BUILDDIR)/ref_softx.$(SHLIBEXT)
+#	$(BUILDDIR)/ref_gl.$(SHLIBEXT) \
+#	$(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
 #	$(BUILDDIR)/ref_soft.$(SHLIBEXT) \
-	$(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT)
+#	$(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT)
 
 build_debug:
 	@-mkdir $(BUILD_DEBUG_DIR) \
diff --git a/makefile b/makefile
deleted file mode 100644
index 2499608..0000000
--- a/makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-MAKEDEPS=$(CC) -MM $(CPPFLAGS) $< | sed -e 's!$*\.o:*!$*\.o $@:!g' > $@
-
-%.d: %.c
-	$(MAKEDEPS)
-
-CPPFLAGS=-DELF
-
-sources=\
-	client/cl_cin.c		\
-	client/cl_ents.c	\
-	client/cl_fx.c		\
-	client/cl_input.c	\
-	client/cl_inv.c		\
-	client/cl_main.c	\
-	client/cl_newfx.c	\
-	client/cl_parse.c	\
-	client/cl_pred.c	\
-	client/cl_scrn.c	\
-	client/cl_tent.c	\
-	client/cl_view.c	\
-	client/console.c	\
-	client/keys.c		\
-	client/menu.c		\
-	client/qmenu.c		\
-	client/snd_dma.c	\
-	client/snd_mem.c	\
-	client/snd_mix.c	\
-	client/x86.c		\
-	game/m_flash.c		\
-	game/q_shared.c		\
-	linux/cd_linux.c	\
-	linux/glob.c		\
-	linux/net_udp.c		\
-	linux/q_shlinux.c	\
-	linux/snd_linux.c	\
-	linux/snd_mixa.S	\
-	linux/sys_linux.c	\
-	linux/vid_so.c		\
-	linux/vid_menu.c	\
-	qcommon/cmd.c		\
-	qcommon/cmodel.c	\
-	qcommon/common.c	\
-	qcommon/crc.c		\
-	qcommon/cvar.c		\
-	qcommon/files.c		\
-	qcommon/md4.c		\
-	qcommon/net_chan.c	\
-	qcommon/pmove.c		\
-	server/sv_ccmds.c	\
-	server/sv_ents.c	\
-	server/sv_game.c	\
-	server/sv_init.c	\
-	server/sv_main.c	\
-	server/sv_send.c	\
-	server/sv_user.c	\
-	server/sv_world.c
-
-objects=$(patsubst %.S,%.o,\
-		$(patsubst %.c,%.o,\
-		$(patsubst %.cc,%.o,\
-		  $(sources))))
-
-quake2: $(objects)
-	gcc -o $@ $^ -lm -ldl
-
--include $(objects:.o=.d)