diff -ruN sage3.0-orig/app/FileViewer/Makefile sage3.0/app/FileViewer/Makefile --- sage3.0-orig/app/FileViewer/Makefile 2008-04-02 14:32:11.000000000 +1000 +++ sage3.0/app/FileViewer/Makefile 2008-04-04 13:30:11.000000000 +1000 @@ -3,7 +3,7 @@ SERVER_DIR = ./FileServer CFLAGS=`Wand-config --cflags --cppflags` -I$(SAGE_DIR)/include -LIBS= -lWand -lMagick -lstdc++ -L/usr/local/lib -lltdl -L$(SAGE_DIR)/lib -lsail +LIBS= -lWand -lMagick -lstdc++ -L/opt/rocks/lib -lltdl -L$(SAGE_DIR)/lib -lsail default: imageviewer diff -ruN sage3.0-orig/app/svc/src/Makefile sage3.0/app/svc/src/Makefile --- sage3.0-orig/app/svc/src/Makefile 2008-04-02 14:31:47.000000000 +1000 +++ sage3.0/app/svc/src/Makefile 2008-04-04 13:36:12.000000000 +1000 @@ -1,7 +1,7 @@ include ../../../config.mk -CFLAGS=-fPIC -O3 -I../include -I../../../include $(QUANTA_CFLAGS) $(GLEW_CFLAGS) $(GLSL_YUV_DEFINE) $(PORTAUDIO_CFLAGS) -LIBS=-lpthread -lm -ldl $(QUANTA_LIB) $(GLEW_LIB) -L../../../lib -lsail -lraw1394 -lpthread -liec61883 -lmpeg2 -lmpeg2convert $(PAUDIO_LIB) +CFLAGS=-fPIC -O3 -I../include -I../../../include $(QUANTA_CFLAGS) $(GLEW_CFLAGS) $(GLSL_YUV_DEFINE) $(PORTAUDIO_CFLAGS) -I/opt/rocks/include +LIBS=-lpthread -lm -ldl $(QUANTA_LIB) $(GLEW_LIB) -L../../../lib -lsail -lraw1394 -lpthread -L/opt/rocks/lib -liec61883 -lmpeg2 -lmpeg2convert $(PAUDIO_LIB) CC=$(COMPILER) default: diff -ruN sage3.0-orig/config.mk sage3.0/config.mk --- sage3.0-orig/config.mk 2008-04-02 14:57:17.000000000 +1000 +++ sage3.0/config.mk 2008-04-04 13:30:11.000000000 +1000 @@ -1,21 +1,21 @@ # To enable audio, uncomment the following line -AUDIO=1 +#AUDIO=1 GLSL_YUV=1 COMPILER=g++ # QUANTA settings -QUANTA_DIR=/usr/local +QUANTA_DIR=/opt/rocks/lib/quanta QUANTA_CFLAGS=-I${QUANTA_DIR}/include -DQUANTA_USE_PTHREADS -DQUANTA_THREAD_SAFE -QUANTA_LIB=-L${QUANTA_DIR}/lib +QUANTA_LIB=-L${QUANTA_DIR}/lib -lquanta # SDL SDL_CFLAGS=`sdl-config --cflags` SDL_LIBS=`sdl-config --libs` # READLINE settings -READLINE_CFLAGS= -READLINE_LIB=-lreadline +READLINE_CFLAGS=-I/opt/rocks/include +READLINE_LIB=-L/opt/rocks/lib -lreadline -ltermcap ifdef AUDIO #PORTAUDIO @@ -41,6 +41,8 @@ GLEW_CFLAGS= GLSL_YUV_DEFINE= endif +GLEW_LIB= -L/usr/lib64 -lGLEW +GLEW_CFLAGS= -I/usr/include # Machine specific settings MACHINE=$(shell uname -s) @@ -78,8 +80,8 @@ else ifeq ($(ARCHITECTURE), x86_64) - # QUANTA - QUANTA_LIB=-L${QUANTA_DIR}/lib -lquanta_64 +# # QUANTA +# QUANTA_LIB=-L${QUANTA_DIR}/lib -lquanta_64 # Lower-level graphics library XLIBS=-L/usr/X11R6/lib64 -lGLU -lGL -lXmu -lXi -lXext -lX11 --- sage3.0-orig/Makefile 2008-04-02 14:57:17.000000000 +1000 +++ sage3.0/Makefile 2008-04-04 13:57:57.000000000 +1000 @@ -1,6 +1,6 @@ preprojects = -subprojects = app app/atlantis app/checker app/vnc app/FileViewer app/bitplay +subprojects = app app/atlantis app/checker app/vnc app/FileViewer app/bitplay app/svc/src default: --- sage3.0-orig/bin/sage 2008-04-02 14:56:35.000000000 +1000 +++ sage3.0/bin/sage 2008-04-04 22:16:54.000000000 +1000 @@ -3,7 +3,7 @@ # run sageLauncher differently if linux or if macos if [ `uname` == "Linux" ] then - python sageLauncher.py + /opt/rocks/bin/python sageLauncher.py else pythonw sageLauncher.py fi