blob: 42f094b48241aa3ff245af035b21109923ff1ab2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
--- h5/glide3/src/makefile.autoconf.am.orig Sun Nov 19 00:00:26 2000
+++ h5/glide3/src/makefile.autoconf.am Tue Dec 5 05:44:58 2006
@@ -152,46 +152,40 @@
#
# Special rules for assembly files.
#
-PREPROCESSOR=/lib/cpp -$$ -I.
+PREPROCESSOR=$(CPP) -$$ -I.
xdraw2_def.o xdraw2_def.lo: xdraw2.s xdraw2.inc.s fxgasm.h
$(PREPROCESSOR) $< > $*.tmp.s
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
- $(CP) $*.o $*.lo
+ libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
xdraw2_3dnow.o xdraw2_3dnow.lo: xdraw2.s xdraw2.inc.s fxgasm.h
$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
- $(CP) $*.o $*.lo
+ libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
xdraw3_def.o xdraw3_def.lo: xdraw3.s fxgasm.h
$(PREPROCESSOR) $< > $*.tmp.s
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
- $(CP) $*.o $*.lo
+ libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
xdraw3_3dnow.o xdraw3_3dnow.lo: xdraw3.s fxgasm.h
$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
- $(CP) $*.o $*.lo
+ libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
xtexdl_3dnow.o xtexdl_3dnow.lo: xtexdl.s fxgasm.h
$(PREPROCESSOR) -DGL_AMD3D -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
- $(CP) $*.o $*.lo
+ libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
if FX_GLIDE_C_CPU_DETECT
CPUSOURCES = cpudtect.c
else
-CPUSOURCES = cpudtect.s
+CPUSOURCES = cpudtect_asm.s
-cpudtect.o cpudtect.lo: cpudtect.s
+cpudtect_asm.o cpudtect_asm.lo: cpudtect.s
$(PREPROCESSOR) -DUSE_PACKET_FIFO=1 $< > $*.tmp.s
- $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
- $(CP) $*.o $*.lo
+ libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s
$(RM) -f $*.tmp.s
endif
@@ -202,7 +196,7 @@
FX_GLIDE_CTRISETUP_SRC = gxdraw.c
else
if GL_AMD3D
-FX_GLIDE_CTRISETUP_SRC = xdraw2_3dnow.s xdraw3_3dnow.s
+FX_GLIDE_CTRISETUP_SRC = xdraw2_3dnow.s xdraw3_3dnow.s xtexdl_3dnow.s xdraw2_def.s xdraw3_def.s
else
FX_GLIDE_CTRISETUP_SRC = xdraw2_def.s xdraw3_def.s
endif
@@ -214,7 +208,7 @@
$(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \
$(top_builddir)/swlibs/$(TEXTURE_UTILITIES_DIR)/lib/libtexus.la \
$(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la
-LINK_LIBS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
+LINK_LIBS = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm
CLEANFILES = fxinline.h fxgasm.h
|
