|
Lines 30-36
Link Here
|
| 30 |
#CXX = g++ |
30 |
#CXX = g++ |
| 31 |
|
31 |
|
| 32 |
# the linker |
32 |
# the linker |
| 33 |
@@ -77,7 +77,10 @@ |
33 |
@@ -80,7 +80,10 @@ |
| 34 |
# the default configuration is to build with Affine as RIB writer without |
34 |
# the default configuration is to build with Affine as RIB writer without |
| 35 |
# any shader parsing library (i.e. you will have to build and load a |
35 |
# any shader parsing library (i.e. you will have to build and load a |
| 36 |
# plugin for shader parsing) |
36 |
# plugin for shader parsing) |
|
Lines 42-59
Link Here
|
| 42 |
|
42 |
|
| 43 |
# simple configuration using BMRT |
43 |
# simple configuration using BMRT |
| 44 |
#CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT |
44 |
#CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT |
| 45 |
@@ -128,49 +131,53 @@ |
45 |
@@ -134,7 +137,7 @@ |
| 46 |
TOGLOBJECT = togl/togl.o |
|
|
| 47 |
|
46 |
|
| 48 |
# OpenGL |
47 |
# OpenGL |
| 49 |
-GLINCDIR = /usr/X11R6/include/ |
48 |
# OpenGL includes |
| 50 |
+GLINCDIR = ${X11BASE}/include/ |
49 |
-GLINC = -I/usr/X11R6/include/ |
|
|
50 |
+GLINC = -I${X11BASE}/include/ |
| 51 |
# MacOSX (Aqua): |
| 52 |
#GLINC = |
| 51 |
# link options for linking with OpenGL libraries |
53 |
# link options for linking with OpenGL libraries |
| 52 |
GLLIBS = -lGLU -lGL |
54 |
@@ -144,24 +147,26 @@ |
| 53 |
|
55 |
|
| 54 |
# TIFF |
56 |
# TIFF |
| 55 |
-TIFFINCDIR = /usr/include/ |
57 |
# TIFF includes |
| 56 |
+TIFFINCDIR = ${LOCALBASE}/include/ |
58 |
-TIFFINC = -I/usr/include/ |
|
|
59 |
+TIFFINC = -I${LOCALBASE}/include/ |
| 57 |
# link options for linking with TIFF library |
60 |
# link options for linking with TIFF library |
| 58 |
TIFFLIB = -ltiff |
61 |
TIFFLIB = -ltiff |
| 59 |
|
62 |
|
|
Lines 67-81
Link Here
|
| 67 |
-TCLINC = -I$(TCLDIR)/generic |
70 |
-TCLINC = -I$(TCLDIR)/generic |
| 68 |
+#TCLINC = -I$(TCLDIR)/generic |
71 |
+#TCLINC = -I$(TCLDIR)/generic |
| 69 |
+TCLINC = -I${LOCALBASE}/include/tcl8.2/generic |
72 |
+TCLINC = -I${LOCALBASE}/include/tcl8.2/generic |
|
|
73 |
# MacOSX (Aqua): |
| 74 |
#TCLINC = |
| 70 |
|
75 |
|
| 71 |
# Tcl library |
76 |
# Tcl library |
| 72 |
# link options for linking with Tcl library |
77 |
# link options for linking with Tcl library |
| 73 |
-TCLLIB = -L$(TCLDIR)/unix -ltcl8.2 |
78 |
-TCLLIB = -L$(TCLDIR)/unix -ltcl8.2 |
| 74 |
+#TCLLIB = -L$(TCLDIR)/unix -ltcl8.2 |
79 |
+#TCLLIB = -L$(TCLDIR)/unix -ltcl8.2 |
| 75 |
#TCLLIB = -L$(TCLDIR)/unix -ltcl8.0 |
80 |
#TCLLIB = -L$(TCLDIR)/unix -ltcl8.0 |
|
|
81 |
+TCLLIB = -L${LOCALBASE}/lib -ltcl82 |
| 76 |
# if you have an installed Tcl/Tk, you probably just want: |
82 |
# if you have an installed Tcl/Tk, you probably just want: |
| 77 |
#TCLLIB = -ltcl |
83 |
#TCLLIB = -ltcl |
| 78 |
+TCLLIB = -L${LOCALBASE}/lib -ltcl82 |
84 |
# MacOSX (Aqua): |
|
|
85 |
@@ -169,18 +174,20 @@ |
| 79 |
|
86 |
|
| 80 |
# Tk sources directory |
87 |
# Tk sources directory |
| 81 |
# Note: You really need the Tk _sources_ in order to compile Ayam! |
88 |
# Note: You really need the Tk _sources_ in order to compile Ayam! |
|
Lines 87-132
Link Here
|
| 87 |
-TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix |
94 |
-TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix |
| 88 |
+#TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix |
95 |
+#TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix |
| 89 |
+TKINC = -I${LOCALBASE}/include/tk8.2/generic -I${LOCALBASE}/include/tk8.2/unix |
96 |
+TKINC = -I${LOCALBASE}/include/tk8.2/generic -I${LOCALBASE}/include/tk8.2/unix |
|
|
97 |
# MacOSX (Aqua): |
| 98 |
#TKINC = -I$(TKDIR)/generic -I$(TKDIR)/macosx -I$(TKDIR)/xlib |
| 90 |
|
99 |
|
| 91 |
# Tk library |
100 |
# Tk library |
| 92 |
# link options for linking with Tk library |
101 |
# link options for linking with Tk library |
| 93 |
-TKLIB = -L$(TKDIR)/unix -ltk8.2 |
102 |
-TKLIB = -L$(TKDIR)/unix -ltk8.2 |
| 94 |
+#TKLIB = -L$(TKDIR)/unix -ltk8.2 |
103 |
+#TKLIB = -L$(TKDIR)/unix -ltk8.2 |
| 95 |
#TKLIB = -L$(TKDIR)/unix -ltk8.0 |
104 |
#TKLIB = -L$(TKDIR)/unix -ltk8.0 |
|
|
105 |
+TKLIB = -L${LOCALBASE}/lib -ltk82 |
| 96 |
# if you have an installed Tcl/Tk, you probably just want: |
106 |
# if you have an installed Tcl/Tk, you probably just want: |
| 97 |
#TKLIB = -ltk |
107 |
#TKLIB = -ltk |
| 98 |
+TKLIB = -L${LOCALBASE}/lib -ltk82 |
108 |
# MacOSX (Aqua): |
|
|
109 |
@@ -188,11 +195,11 @@ |
| 99 |
|
110 |
|
| 100 |
|
111 |
# X11 |
| 101 |
# X11-libs |
112 |
# X11 includes |
|
|
113 |
-X11INC = -I/usr/X11R6/include |
| 114 |
+X11INC = -I${X11BASE}/include |
| 115 |
# MacOSX (Aqua): |
| 116 |
#X11INC = |
| 102 |
# link options for linking with X11 |
117 |
# link options for linking with X11 |
| 103 |
-X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 |
118 |
-X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 |
| 104 |
+X11LIBS = -L${X11BASE}/lib -lXmu -lXext -lX11 |
119 |
+X11LIBS = -L${X11BASE}/lib -lXmu -lXext -lX11 |
| 105 |
#X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 |
120 |
#X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 |
| 106 |
|
121 |
# MacOSX (Aqua): |
| 107 |
|
122 |
#X11LIBS = |
| 108 |
@@ -179,23 +186,23 @@ |
123 |
@@ -203,23 +210,23 @@ |
| 109 |
AFFINEINCDIR = ./affine/include |
124 |
AFFINEINC = -Iaffine/include |
| 110 |
# if you use Affine as BMRT libribout replacement |
125 |
# if you use Affine as BMRT libribout replacement |
| 111 |
# (also add -DAYUSEAFFINE to CFLAGS!): |
126 |
# (also add -DAYUSEAFFINE to CFLAGS!): |
| 112 |
-AFFINEOBJS = ./affine/src/write.o ./affine/src/constant.o |
127 |
-AFFINEOBJS = ./affine/src/write.o ./affine/src/constant.o |
| 113 |
+#AFFINEOBJS = ./affine/src/write.o ./affine/src/constant.o |
128 |
+#AFFINEOBJS = ./affine/src/write.o ./affine/src/constant.o |
| 114 |
# if you do not use Affine as BMRT libribout replacement: |
129 |
# if you do not use Affine as BMRT libribout replacement: |
| 115 |
-#AFFINEOBJS = |
130 |
-#AFFINEOBJS = |
| 116 |
+AFFINEOBJS = |
131 |
+AFFINEOBJS = |
| 117 |
|
132 |
|
| 118 |
# Aqsis |
133 |
# Aqsis |
| 119 |
-AQSISDIR = /usr/local/aqsis |
134 |
-AQSISDIR = /usr/local/aqsis |
| 120 |
-AQSISINCDIR = $(AQSISDIR)/include |
135 |
-AQSISINC = -I$(AQSISDIR)/include |
| 121 |
+AQSISDIR = ${LOCALBASE} |
136 |
+AQSISDIR = ${LOCALBASE} |
| 122 |
+AQSISINCDIR = $(AQSISDIR)/include/aqsis |
137 |
+AQSISINC = -I$(AQSISDIR)/include/aqsis |
| 123 |
AQSISLIBDIR = $(AQSISDIR)/lib |
138 |
AQSISLIBDIR = $(AQSISDIR)/lib |
| 124 |
# if you do not use Aqsis libslxargs as libslcargs replacement: |
139 |
# if you do not use Aqsis libslxargs as libslcargs replacement: |
| 125 |
-AQSISOBJS = |
140 |
-AQSISOBJS = |
| 126 |
+#AQSISOBJS = |
141 |
+#AQSISOBJS = |
| 127 |
# if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!): |
142 |
# if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!): |
| 128 |
-#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp |
143 |
-#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp |
| 129 |
+AQSISOBJS = $(AQSISLIBDIR)/libaqsis.a $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L ${LOCALBASE}/lib $(AQSISLIBDIR)/libraytrace.so -lstdc++ |
144 |
+AQSISOBJS = $(AQSISLIBDIR)/libaqsis.a $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L${AQSISLIBDIR} $(AQSISLIBDIR)/libraytrace.so -lstdc++ |
| 130 |
|
145 |
|
| 131 |
# if you do not use Aqsis libri2rib as BMRT libribout replacement: |
146 |
# if you do not use Aqsis libri2rib as BMRT libribout replacement: |
| 132 |
-AQSISRI2RIB = |
147 |
-AQSISRI2RIB = |
|
Lines 137-168
Link Here
|
| 137 |
|
152 |
|
| 138 |
|
153 |
|
| 139 |
# BMRT |
154 |
# BMRT |
| 140 |
@@ -220,9 +227,9 @@ |
155 |
@@ -247,9 +254,9 @@ |
| 141 |
# IRIX, Solaris, (MacOSX: get libdl from Fink!): |
156 |
# IRIX, Solaris, (MacOSX<10.4: get libdl from Fink!): |
| 142 |
#DL = -ldl |
157 |
#DL = -ldl |
| 143 |
# Linux: |
158 |
# Linux: |
| 144 |
-DL = -ldl -lpthread |
159 |
-DL = -ldl -lpthread |
| 145 |
+#DL = -ldl -lpthread |
160 |
+#DL = -ldl -lpthread |
| 146 |
# NetBSD: |
161 |
# NetBSD/MacOSX (Aqua): |
| 147 |
-#DL = |
162 |
-#DL = |
| 148 |
+DL = |
163 |
+DL = |
| 149 |
|
164 |
|
|
|
165 |
|
| 150 |
# linker flags to produce shared modules: |
166 |
# linker flags to produce shared modules: |
| 151 |
# Linux, Solaris, IRIX: |
167 |
@@ -266,8 +273,8 @@ |
| 152 |
@@ -236,8 +243,8 @@ |
|
|
| 153 |
RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm |
168 |
RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm |
| 154 |
|
169 |
|
| 155 |
# Ayslx Plugin (Aqsis) |
170 |
# Ayslx Plugin (Aqsis) |
| 156 |
-AYSLXINCDIR = $(AQSISDIR)/include |
171 |
-AYSLXINCDIR = $(AQSISDIR)/include |
| 157 |
-AYSLXLIBS = $(AQSISDIR)/lib/rcdummy.o $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L/usr/local/lib -llog4cpp |
172 |
-AYSLXLIBS = $(AQSISDIR)/lib/rcdummy.o $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L/usr/local/lib -llog4cpp |
| 158 |
+AYSLXINCDIR = ${AQSISINCDIR} |
173 |
+AYSLXINCDIR = ${AQSISINC} |
| 159 |
+AYSLXLIBS = -L${AQSISLIBDIR} $(AQSISDIR)/lib/libaqsis.so $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L${LOCALBASE}/lib |
174 |
+AYSLXLIBS = -L${AQSISLIBDIR} $(AQSISDIR)/lib/libaqsis.so $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L${LOCALBASE}/lib |
| 160 |
|
175 |
|
| 161 |
# Ayso Plugin (RenderDotC, RDC) |
176 |
# Ayso Plugin (RenderDotC, RDC) |
| 162 |
RDCDIR = /usr/local/rdc |
177 |
RDCDIR = /usr/local/rdc |
| 163 |
@@ -431,7 +438,7 @@ |
178 |
@@ -464,7 +471,7 @@ |
| 164 |
.cpp.o: |
179 |
.cpp.o: |
| 165 |
$(CXX) -c $(CFLAGS) $*.cpp -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(BMRTINCDIR) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(OPENCSGINCDIR) -I$(GLEWINCDIR) -Iplugins |
180 |
$(CXX) -c $(CFLAGS) $*.cpp -o $@ -I. -IMF3D $(TOGLINC) $(TCLINC) $(TKINC) $(BMRTINC) $(GLINC) $(AFFINEINC) $(AQSISINC) -I$(OPENCSGINCDIR) -I$(GLEWINCDIR) -Iplugins |
| 166 |
|
181 |
|
| 167 |
-all: ayamsh csphere.so mfio.so metaobj.so |
182 |
-all: ayamsh csphere.so mfio.so metaobj.so |
| 168 |
+all: ayamsh csphere.so mfio.so metaobj.so ayslx.so |
183 |
+all: ayamsh csphere.so mfio.so metaobj.so ayslx.so |