|
Lines 1-5
Link Here
|
| 1 |
--- Makefile.shared.orig Sat Mar 27 03:17:07 2004 |
1 |
--- Makefile.shared.orig Sat Mar 27 03:17:07 2004 |
| 2 |
+++ Makefile.shared Thu Apr 1 11:37:18 2004 |
2 |
+++ Makefile.shared Fri May 14 06:48:16 2004 |
| 3 |
@@ -4,7 +4,7 @@ |
3 |
@@ -4,7 +4,7 @@ |
| 4 |
# Makefile for Ayam (shared version) |
4 |
# Makefile for Ayam (shared version) |
| 5 |
|
5 |
|
|
Lines 96-116
Link Here
|
| 96 |
|
96 |
|
| 97 |
# Aqsis |
97 |
# Aqsis |
| 98 |
-AQSISDIR = /usr/local/aqsis |
98 |
-AQSISDIR = /usr/local/aqsis |
|
|
99 |
-AQSISINCDIR = $(AQSISDIR)/include |
| 100 |
-AQSISLIBDIR = $(AQSISDIR)/lib |
| 99 |
+AQSISDIR = ${LOCALBASE} |
101 |
+AQSISDIR = ${LOCALBASE} |
| 100 |
AQSISINCDIR = $(AQSISDIR)/include |
102 |
+AQSISINCDIR = $(AQSISDIR)/include/aqsis |
| 101 |
AQSISLIBDIR = $(AQSISDIR)/lib |
103 |
+AQSISLIBDIR = $(AQSISDIR)/lib/aqsis |
| 102 |
# if you do not use Aqsis libslxargs as libslcargs replacement: |
104 |
# if you do not use Aqsis libslxargs as libslcargs replacement: |
| 103 |
-AQSISOBJS = |
105 |
-AQSISOBJS = |
| 104 |
+#AQSISOBJS = |
106 |
+#AQSISOBJS = |
| 105 |
# if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!): |
107 |
# if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!): |
| 106 |
-#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp |
108 |
-#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp |
| 107 |
+AQSISOBJS = $(AQSISDIR)/lib/libaqsis.so $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -llog4cpp |
109 |
+AQSISOBJS = -L${AQSISLIBDIR} $(AQSISDIR)/lib/libaqsis.so $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -llog4cpp |
| 108 |
|
110 |
|
| 109 |
# if you do not use Aqsis libri2rib as BMRT libribout replacement: |
111 |
# if you do not use Aqsis libri2rib as BMRT libribout replacement: |
| 110 |
#AQSISRI2RIB = |
112 |
#AQSISRI2RIB = |
| 111 |
# if you use Aqsis libri2rib (add -DAYUSEAQSISRIB to CFLAGS above!): |
113 |
# if you use Aqsis libri2rib (add -DAYUSEAQSISRIB to CFLAGS above!): |
| 112 |
-AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L /usr/local/lib -llog4cpp |
114 |
-AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L /usr/local/lib -llog4cpp |
| 113 |
+AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L ${LOCALBASE}/lib -llog4cpp ${PTHREAD_LIBS} |
115 |
+AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L${AQSISLIBDIR} -llog4cpp ${PTHREAD_LIBS} |
| 114 |
|
116 |
|
| 115 |
|
117 |
|
| 116 |
# BMRT |
118 |
# BMRT |
|
Lines 138-149
Link Here
|
| 138 |
|
140 |
|
| 139 |
# linker flags to produce shared modules: |
141 |
# linker flags to produce shared modules: |
| 140 |
# Linux, Solaris, IRIX: |
142 |
# Linux, Solaris, IRIX: |
| 141 |
@@ -223,7 +228,7 @@ |
143 |
@@ -222,8 +227,8 @@ |
|
|
144 |
RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm |
| 142 |
|
145 |
|
| 143 |
# Ayslx Plugin (Aqsis) |
146 |
# Ayslx Plugin (Aqsis) |
| 144 |
AYSLXINCDIR = $(AQSISDIR)/include |
147 |
-AYSLXINCDIR = $(AQSISDIR)/include |
| 145 |
-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 |
148 |
-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 |
| 146 |
+AYSLXLIBS = $(AQSISDIR)/lib/libaqsis.so $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L${LOCALBASE}/lib -llog4cpp |
149 |
+AYSLXINCDIR = ${AQSISINCDIR} |
|
|
150 |
+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 -llog4cpp |
| 147 |
|
151 |
|
| 148 |
# Ayso Plugin (RenderDotC, RDC) |
152 |
# Ayso Plugin (RenderDotC, RDC) |
| 149 |
RDCDIR = /usr/local/rdc |
153 |
RDCDIR = /usr/local/rdc |