|
Lines 1-15
Link Here
|
| 1 |
--- ORIG/Makefile Wed Mar 11 23:11:26 1998 |
1 |
--- Makefile.orig Thu Mar 12 13:11:26 1998 |
| 2 |
+++ Makefile Wed Aug 18 18:57:46 1999 |
2 |
+++ Makefile Thu Aug 10 21:13:42 2000 |
| 3 |
@@ -61,23 +61,28 @@ |
3 |
@@ -58,26 +58,30 @@ |
| 4 |
CC = cc |
4 |
|
|
|
5 |
|
| 6 |
# The C compiler: |
| 7 |
-CC = cc |
| 8 |
+CC ?= cc |
| 5 |
|
9 |
|
| 6 |
# Compiler options: |
10 |
# Compiler options: |
| 7 |
-COPTS = -c -O |
11 |
-COPTS = -c -O |
| 8 |
+COPTS = -c -O -w |
12 |
+COPTS = -c -w |
| 9 |
|
13 |
|
| 10 |
# Shared library linker command: |
14 |
# Shared library linker command: |
| 11 |
-SHLINK = cc -G |
15 |
-SHLINK = cc -G |
| 12 |
+SHLINK = cc -shared |
16 |
+SHLINK = ${CC} -shared |
| 13 |
|
17 |
|
| 14 |
# Name for the shared lib: |
18 |
# Name for the shared lib: |
| 15 |
-#SH_LIB = libtogl.so.1.3 |
19 |
-#SH_LIB = libtogl.so.1.3 |
|
Lines 20-35
Link Here
|
| 20 |
-# Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc: |
24 |
-# Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc: |
| 21 |
-INCLUDES = -I/usr/local/include -I/usr/include/tcl |
25 |
-INCLUDES = -I/usr/local/include -I/usr/include/tcl |
| 22 |
+# Where to find tc.hl, tk.h, OpenGL/Mesa headers, etc: |
26 |
+# Where to find tc.hl, tk.h, OpenGL/Mesa headers, etc: |
| 23 |
+INCLUDES = -I/usr/local/include/tcl8.2 \ |
27 |
+INCLUDES = -I${LOCALBASE}/include/tcl8.2 \ |
| 24 |
+ -I/usr/local/include/tk8.2 \ |
28 |
+ -I${LOCALBASE}/include/tk8.2 \ |
| 25 |
+ -I/usr/local/include/tk8.2/generic \ |
29 |
+ -I${LOCALBASE}/include/tk8.2/generic \ |
| 26 |
+ -I/usr/X11R6/include \ |
30 |
+ -I${X11BASE}/include |
| 27 |
+ -I/usr/include/tcl |
|
|
| 28 |
|
31 |
|
| 29 |
# Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries: |
32 |
# Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries: |
| 30 |
-LIBDIRS = -L/usr/local/lib |
33 |
-LIBDIRS = -L/usr/local/lib |
| 31 |
+LIBDIRS = -L/usr/local/lib \ |
34 |
+LIBDIRS = -L${LOCALBASE}/lib \ |
| 32 |
+ -L/usr/X11R6/lib |
35 |
+ -L${X11BASE}/lib |
| 33 |
|
36 |
|
| 34 |
# Libraries to link with (-ldl for Linux only?): |
37 |
# Libraries to link with (-ldl for Linux only?): |
| 35 |
-LIBS = -ltk -ltcl -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl |
38 |
-LIBS = -ltk -ltcl -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl |
|
Lines 37-43
Link Here
|
| 37 |
|
40 |
|
| 38 |
TK_FLAGS = |
41 |
TK_FLAGS = |
| 39 |
|
42 |
|
| 40 |
@@ -144,8 +149,8 @@ |
43 |
@@ -85,7 +89,7 @@ |
|
|
44 |
#### Shouldn't have to change anything beyond this point #### |
| 45 |
|
| 46 |
|
| 47 |
-CFLAGS = $(COPTS) $(INCLUDES) $(TK_FLAGS) |
| 48 |
+CFLAGS += $(COPTS) $(INCLUDES) $(TK_FLAGS) |
| 49 |
|
| 50 |
LFLAGS = $(LIBDIRS) |
| 51 |
|
| 52 |
@@ -144,8 +148,8 @@ |
| 41 |
$(CC) $(CFLAGS) togl.c |
53 |
$(CC) $(CFLAGS) togl.c |