|
Lines 1-5
Link Here
|
| 1 |
--- Makefile.shared.orig Sat Mar 27 03:17:07 2004 |
1 |
|
| 2 |
+++ Makefile.shared Tue Oct 5 21:43:30 2004 |
2 |
$FreeBSD$ |
|
|
3 |
|
| 4 |
--- Makefile.shared.orig |
| 5 |
+++ Makefile.shared |
| 3 |
@@ -4,7 +4,7 @@ |
6 |
@@ -4,7 +4,7 @@ |
| 4 |
# Makefile for Ayam (shared version) |
7 |
# Makefile for Ayam (shared version) |
| 5 |
|
8 |
|
|
Lines 9-22
Link Here
|
| 9 |
#PREFIX = /opt/ayam |
12 |
#PREFIX = /opt/ayam |
| 10 |
# if you use one of the following, be sure to change LIBDIR |
13 |
# if you use one of the following, be sure to change LIBDIR |
| 11 |
# and DOCDIR to a more suitable (Ayam specific) path |
14 |
# and DOCDIR to a more suitable (Ayam specific) path |
| 12 |
@@ -34,14 +34,14 @@ |
15 |
@@ -31,21 +31,21 @@ |
| 13 |
MKDIR = mkdir -p |
|
|
| 14 |
|
16 |
|
| 15 |
# the compiler |
17 |
INSTALL = ./ninstall |
|
|
18 |
#INSTALL = install |
| 19 |
-MKDIR = mkdir -p |
| 20 |
+#MKDIR = mkdir -p |
| 21 |
|
| 22 |
# the C compiler |
| 16 |
-CC = cc |
23 |
-CC = cc |
| 17 |
+CC ?= cc |
24 |
+CC ?= cc |
| 18 |
#CC = gcc |
25 |
#CC = gcc |
| 19 |
|
26 |
|
|
|
27 |
# the C++ compiler (just in use for the Aycsg plugin) |
| 28 |
-CXX = CC |
| 29 |
+CXX = ${CC} |
| 30 |
#CXX = g++-3.0 |
| 31 |
|
| 20 |
# the linker |
32 |
# the linker |
| 21 |
# Starting with BMRT2.5, libribout and libslcargs are in C++, |
33 |
# Starting with BMRT2.5, libribout and libslcargs are in C++, |
| 22 |
# which forces us to use "CC" or "g++" to link the right libraries |
34 |
# which forces us to use "CC" or "g++" to link the right libraries |
|
Lines 26-32
Link Here
|
| 26 |
# for Linux, use |
38 |
# for Linux, use |
| 27 |
#LD = g++ |
39 |
#LD = g++ |
| 28 |
# MacOSX |
40 |
# MacOSX |
| 29 |
@@ -68,7 +68,8 @@ |
41 |
@@ -73,7 +73,8 @@ |
| 30 |
# o add -DAYOLDSLX if you compile with an Aqsis libslxargs prior to 0.7.19 |
42 |
# o add -DAYOLDSLX if you compile with an Aqsis libslxargs prior to 0.7.19 |
| 31 |
# o add -DUSE_NON_CONST if you compile with Tcl/Tk 8.4.x |
43 |
# o add -DUSE_NON_CONST if you compile with Tcl/Tk 8.4.x |
| 32 |
|
44 |
|
|
Lines 36-42
Link Here
|
| 36 |
# IRIX (-DAYIRIXBUG is needed by ncurve.c to work around a bug in libGLU):: |
48 |
# IRIX (-DAYIRIXBUG is needed by ncurve.c to work around a bug in libGLU):: |
| 37 |
#CFLAGS = -O -fullwarn -DAYIRIXBUG -DAYUSESLCARGS -DAYUSEBMRTRIBOUT |
49 |
#CFLAGS = -O -fullwarn -DAYIRIXBUG -DAYUSESLCARGS -DAYUSEBMRTRIBOUT |
| 38 |
# Linux: |
50 |
# Linux: |
| 39 |
@@ -115,49 +116,53 @@ |
51 |
@@ -120,49 +121,53 @@ |
| 40 |
TOGLOBJECT = togl/togl.o |
52 |
TOGLOBJECT = togl/togl.o |
| 41 |
|
53 |
|
| 42 |
# OpenGL |
54 |
# OpenGL |
|
Lines 99-105
Link Here
|
| 99 |
#X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 |
111 |
#X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 |
| 100 |
|
112 |
|
| 101 |
|
113 |
|
| 102 |
@@ -172,18 +177,18 @@ |
114 |
@@ -177,18 +182,18 @@ |
| 103 |
|
115 |
|
| 104 |
|
116 |
|
| 105 |
# Aqsis |
117 |
# Aqsis |
|
Lines 123-129
Link Here
|
| 123 |
|
135 |
|
| 124 |
|
136 |
|
| 125 |
# BMRT |
137 |
# BMRT |
| 126 |
@@ -194,9 +199,9 @@ |
138 |
@@ -199,9 +204,9 @@ |
| 127 |
BMRTINCDIR = $(BMRTDIR)/include |
139 |
BMRTINCDIR = $(BMRTDIR)/include |
| 128 |
BMRTLIBDIR = $(BMRTDIR)/lib |
140 |
BMRTLIBDIR = $(BMRTDIR)/lib |
| 129 |
# if you use BMRT libribout and not Affine: |
141 |
# if you use BMRT libribout and not Affine: |
|
Lines 135-141
Link Here
|
| 135 |
# if you do not use libslcargs from BMRT: |
147 |
# if you do not use libslcargs from BMRT: |
| 136 |
SLCARGSLIB = |
148 |
SLCARGSLIB = |
| 137 |
# if you use Affine as BMRT libribout replacement and libslcargs from BMRT: |
149 |
# if you use Affine as BMRT libribout replacement and libslcargs from BMRT: |
| 138 |
@@ -206,9 +211,9 @@ |
150 |
@@ -211,9 +216,9 @@ |
| 139 |
# Dynamic Loading |
151 |
# Dynamic Loading |
| 140 |
# Library for dynamic loading (contains dlopen()) |
152 |
# Library for dynamic loading (contains dlopen()) |
| 141 |
# Linux, IRIX, Solaris, (MacOSX: get libdl from Fink!): |
153 |
# Linux, IRIX, Solaris, (MacOSX: get libdl from Fink!): |
|
Lines 147-153
Link Here
|
| 147 |
|
159 |
|
| 148 |
# linker flags to produce shared modules: |
160 |
# linker flags to produce shared modules: |
| 149 |
# Linux, Solaris, IRIX: |
161 |
# Linux, Solaris, IRIX: |
| 150 |
@@ -222,8 +227,8 @@ |
162 |
@@ -227,8 +232,8 @@ |
| 151 |
RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm |
163 |
RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm |
| 152 |
|
164 |
|
| 153 |
# Ayslx Plugin (Aqsis) |
165 |
# Ayslx Plugin (Aqsis) |
|
Lines 158-166
Link Here
|
| 158 |
|
170 |
|
| 159 |
# Ayso Plugin (RenderDotC, RDC) |
171 |
# Ayso Plugin (RenderDotC, RDC) |
| 160 |
RDCDIR = /usr/local/rdc |
172 |
RDCDIR = /usr/local/rdc |
| 161 |
@@ -373,9 +378,9 @@ |
173 |
@@ -413,9 +418,9 @@ |
| 162 |
.c.o: |
174 |
.cpp.o: |
| 163 |
$(CC) -c $(CFLAGS) $*.c -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(BMRTINCDIR) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(TIFFINCDIR) |
175 |
$(CXX) -c $(CFLAGS) $*.cpp -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(BMRTINCDIR) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(OPENCSGINCDIR) -I$(GLEWINCDIR) -Iplugins |
| 164 |
|
176 |
|
| 165 |
-all: ayamsh csphere.so mfio.so metaobj.so |
177 |
-all: ayamsh csphere.so mfio.so metaobj.so |
| 166 |
+all: ayamsh csphere.so mfio.so metaobj.so ayslx.so |
178 |
+all: ayamsh csphere.so mfio.so metaobj.so ayslx.so |
|
Lines 169-172
Link Here
|
| 169 |
+ayamsh: $(AYAMOBJS) $(TOGLOBJECT) |
181 |
+ayamsh: $(AYAMOBJS) $(TOGLOBJECT) |
| 170 |
$(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL) |
182 |
$(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL) |
| 171 |
|
183 |
|
| 172 |
csphere.so: $(CSPHEREOBJS) |
184 |
aycsg.so: $(AYCSGOBJS) $(OPENCSGOBJS) |