ok, core links with no evil hacks

2025-01-31 13:01:02 +00:00 · 2001-12-22 06:12:56 +00:00 · 2001-12-22 06:12:56 +00:00 · 96826650c8
commit 96826650c8
parent caddaeabef
16 changed files with 10 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+quake2
--- a/linux/d_copy.S
+++ b/linux/d_copy.S
--- a/linux/d_polysa.S
+++ b/linux/d_polysa.S
--- a/linux/math.S
+++ b/linux/math.S
--- a/linux/qasm.h
+++ b/linux/qasm.h
@ -18,11 +18,11 @@

 #endif

-//#ifdef __i386__
-//#define id386	1
-//#else
+#ifdef __i386__
+#define id386	1
+#else
 #define id386	0
-//#endif
+#endif

 // !!! must be kept the same as in d_iface.h !!!
 #define TRANSPARENT_COLOR	255
--- a/linux/r_aclipa.S
+++ b/linux/r_aclipa.S
--- a/linux/r_draw16.S
+++ b/linux/r_draw16.S
--- a/linux/r_drawa.S
+++ b/linux/r_drawa.S
--- a/linux/r_edgea.S
+++ b/linux/r_edgea.S
--- a/linux/r_scana.S
+++ b/linux/r_scana.S
--- a/linux/r_spr8.S
+++ b/linux/r_spr8.S
--- a/linux/r_surf8.S
+++ b/linux/r_surf8.S
--- a/linux/r_varsa.S
+++ b/linux/r_varsa.S
--- a/linux/snd_mixa.S
+++ b/linux/snd_mixa.S
--- a/linux/sys_dosa.S
+++ b/linux/sys_dosa.S
--- a/6
+++ b/6
@ -3,6 +3,8 @@ MAKEDEPS=$(CC) -MM $(CPPFLAGS) $< | sed -e 's!$*\.o:*!$*\.o $@:!g' > $@
 %.d: %.c
 	$(MAKEDEPS)

+CPPFLAGS=-DELF
+
 sources=\
 	client/cl_cin.c		\
 	client/cl_ents.c	\
@ -27,9 +29,11 @@ sources=\
 	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	\
@ -51,7 +55,7 @@ sources=\
 	server/sv_user.c	\
 	server/sv_world.c

-objects=$(patsubst %.s,%.o,\
+objects=$(patsubst %.S,%.o,\
 		$(patsubst %.c,%.o,\
 		$(patsubst %.cc,%.o,\
 		  $(sources))))