|
Lines 1-4
Link Here
|
| 1 |
--- src/unix-gcc.mak.orig Sat Mar 18 05:13:40 2000 |
1 |
--- src/unix-gcc.mak Fri Mar 17 23:13:40 2000 |
| 2 |
+++ src/unix-gcc.mak Sat Mar 25 21:47:45 2000 |
2 |
+++ src/unix-gcc.mak Wed Jul 19 10:23:42 2000 |
| 3 |
@@ -52,11 +52,10 @@ |
3 |
@@ -26,14 +26,15 @@ |
|
|
4 |
# source, generated intermediate file, and object directories |
| 5 |
# for the graphics library (GL) and the PostScript/PDF interpreter (PS). |
| 6 |
|
| 7 |
-BINDIR=./bin |
| 8 |
-GLSRCDIR=./src |
| 9 |
-GLGENDIR=./obj |
| 10 |
-GLOBJDIR=./obj |
| 11 |
-PSSRCDIR=./src |
| 12 |
-PSLIBDIR=./lib |
| 13 |
-PSGENDIR=./obj |
| 14 |
-PSOBJDIR=./obj |
| 15 |
+.CURDIR?=. |
| 16 |
+BINDIR=${.CURDIR}/bin |
| 17 |
+GLSRCDIR=${.CURDIR}/src |
| 18 |
+GLGENDIR=${.CURDIR}/obj |
| 19 |
+GLOBJDIR=${.CURDIR}/obj |
| 20 |
+PSSRCDIR=${.CURDIR}/src |
| 21 |
+PSLIBDIR=${.CURDIR}/lib |
| 22 |
+PSGENDIR=${.CURDIR}/obj |
| 23 |
+PSOBJDIR=${.CURDIR}/obj |
| 24 |
|
| 25 |
# Do not edit the next group of lines. |
| 26 |
|
| 27 |
@@ -52,11 +53,10 @@ |
| 4 |
# the directories also define the default search path for the |
28 |
# the directories also define the default search path for the |
|
Lines 17-19
Link Here
|
| 17 |
scriptdir = $(bindir) |
41 |
scriptdir = $(bindir) |
| 18 |
@@ -153,7 +152,7 @@ |
42 |
@@ -128,7 +128,7 @@ |
|
|
43 |
# You may need to change this if the IJG library version changes. |
| 44 |
# See jpeg.mak for more information. |
| 45 |
|
| 46 |
-JSRCDIR=jpeg |
| 47 |
+JSRCDIR=${.CURDIR}/jpeg |
| 48 |
JVERSION=6 |
| 49 |
|
| 50 |
# Choose whether to use a shared version of the IJG JPEG library (-ljpeg). |
| 51 |
@@ -146,14 +147,14 @@ |
| 52 |
# You may need to change this if the libpng version changes. |
| 53 |
# See libpng.mak for more information. |
| 54 |
|
| 55 |
-PSRCDIR=libpng |
| 56 |
+PSRCDIR=${PREFIX}/include |
| 57 |
PVERSION=10005 |
| 58 |
|
| 59 |
# Choose whether to use a shared version of the PNG library, and if so, |
| 19 |
# what its name is. |
60 |
# what its name is. |
|
Lines 26-28
Link Here
|
| 26 |
# Define the directory where the zlib sources are stored. |
67 |
# Define the directory where the zlib sources are stored. |
| 27 |
@@ -165,7 +164,7 @@ |
68 |
@@ -165,7 +165,7 @@ |
| 28 |
# what its name is (usually libz, but sometimes libgz). |
69 |
# what its name is (usually libz, but sometimes libgz). |
|
Lines 35-37
Link Here
|
| 35 |
|
76 |
|
| 36 |
@@ -180,7 +179,7 @@ |
77 |
@@ -180,7 +180,7 @@ |
| 37 |
|
78 |
|
|
Lines 40-42
Link Here
|
| 40 |
-CC=gcc |
81 |
-CC=gcc |
| 41 |
+CC=cc |
82 |
+CC?=cc |
| 42 |
|
83 |
|
|
Lines 44-46
Link Here
|
| 44 |
# Normally this is the same as the C compiler. |
85 |
# Normally this is the same as the C compiler. |
| 45 |
@@ -213,7 +212,7 @@ |
86 |
@@ -213,7 +213,7 @@ |
| 46 |
# gcc to accept ANSI-style function prototypes and function definitions. |
87 |
# gcc to accept ANSI-style function prototypes and function definitions. |
|
Lines 53-55
Link Here
|
| 53 |
# SunOS 4.n may need -Bstatic. |
94 |
# SunOS 4.n may need -Bstatic. |
| 54 |
@@ -222,7 +221,7 @@ |
95 |
@@ -222,7 +222,7 @@ |
| 55 |
# -R /usr/local/xxx/lib:/usr/local/lib |
96 |
# -R /usr/local/xxx/lib:/usr/local/lib |
|
Lines 62-64
Link Here
|
| 62 |
|
103 |
|
| 63 |
@@ -242,7 +241,7 @@ |
104 |
@@ -242,7 +242,7 @@ |
| 64 |
# All reasonable platforms require -lm, but Rhapsody and perhaps one or |
105 |
# All reasonable platforms require -lm, but Rhapsody and perhaps one or |
|
Lines 71-73
Link Here
|
| 71 |
# This can be null if handled in some other way (e.g., the files are |
112 |
# This can be null if handled in some other way (e.g., the files are |
| 72 |
@@ -252,7 +251,7 @@ |
113 |
@@ -252,7 +252,7 @@ |
| 73 |
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11, |
114 |
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11, |
|
Lines 80-82
Link Here
|
| 80 |
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH |
121 |
# XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH |
| 81 |
@@ -264,12 +263,12 @@ |
122 |
@@ -264,12 +264,12 @@ |
| 82 |
# Solaris and other SVR4 systems with dynamic linking probably want |
123 |
# Solaris and other SVR4 systems with dynamic linking probably want |
|
Lines 96-98
Link Here
|
| 96 |
# FPU_TYPE=2 means floating point is faster than fixed point. |
137 |
# FPU_TYPE=2 means floating point is faster than fixed point. |
| 97 |
@@ -327,7 +326,7 @@ |
138 |
@@ -327,7 +327,7 @@ |
| 98 |
# Choose the device(s) to include. See devs.mak for details, |
139 |
# Choose the device(s) to include. See devs.mak for details, |
|
Lines 105-107
Link Here
|
| 105 |
#DEVICE_DEVS2= |
146 |
#DEVICE_DEVS2= |
| 106 |
@@ -345,27 +344,27 @@ |
147 |
@@ -345,27 +345,27 @@ |
| 107 |
#DEVICE_DEVS14= |
148 |
#DEVICE_DEVS14= |
|
Lines 154-156
Link Here
|
| 154 |
|
195 |
|
| 155 |
@@ -379,13 +378,13 @@ |
196 |
@@ -379,13 +379,13 @@ |
| 156 |
# detect whether we're running a version of gcc with the const optimization |
197 |
# detect whether we're running a version of gcc with the const optimization |
|
Lines 171-173
Link Here
|
| 171 |
CC_LEAF_PG=$(CC_) |
212 |
CC_LEAF_PG=$(CC_) |
| 172 |
@@ -412,5 +411,5 @@ |
213 |
@@ -412,5 +412,5 @@ |
| 173 |
include $(GLSRCDIR)/unixinst.mak |
214 |
include $(GLSRCDIR)/unixinst.mak |