Changeset 574 for trunk

Timestamp:

Feb 12, 2007, 9:06:22 AM (18 years ago)

Author:

kennell

Message:

Rearranged Makefile to refer to libviz.a instead of a bunch of objects.
Changed references to <GL/glui.h> to <glui.h>
Minor correction of a static class method declaration.

Location:

trunk/gui/vizservers/nanovis

Files:

• Makefile (modified) (2 diffs)
• transfer-function/ColorGradientGLUTWindow.h (modified) (2 diffs)
• transfer-function/ColorPaletteWindow.h (modified) (1 diff)
• transfer-function/MainWindow.h (modified) (1 diff)
• transfer-function/TransferFunctionMain.h (modified) (1 diff)

trunk/gui/vizservers/nanovis/Makefile

@@ -18 +18 @@
 LIB_NANOVIS = -ltcl8.4 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++
 LIB_CLIENT = -L/opt/render/lib -lGL -lglut -pthread -lstdc++
-INCLUDES = -I../../src2/core -I/opt/render/include -I/autohome/u76/qiaow/Cg/usr/include
+INCLUDES = -I../../../src2/core -I/opt/render/include -I/usr/include/GL -I/usr/include/tcl8.4
 CFLAG = -g -c $(INCLUDES)
 
@@ -30 +30 @@
 
 nanovis: $(OBJ_NANOVIS)
-        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../../src2/core/*.o
+        (cd ../../../src2/core; make libviz.a)
+        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../../../src2/core/libviz.a
 
 ColorGradient.o: Color.o $(TFSRC)/ColorGradient.cpp

trunk/gui/vizservers/nanovis/transfer-function/ColorGradientGLUTWindow.h

@@ -19 +19 @@
 
 
-#include "GL/glui.h"
+#include "glui.h"
 #include "ColorGradient.h"
 #include "ControlPoint.h"
@@ -61 +61 @@
         static void createGLUIWidgets();
         static void WriteControlPoints();
-        static void ColorGradientGLUTWindow::printInterpolation();
+        static void printInterpolation();
 
         ColorGradientGLUTWindow();

trunk/gui/vizservers/nanovis/transfer-function/ColorPaletteWindow.h

@@ -18 +18 @@
 
 //ColorPalette Window to select color from
-#include <GL/glui.h>
+#include <glui.h>
 
 #include "../Color.h"

trunk/gui/vizservers/nanovis/transfer-function/MainWindow.h

@@ -18 +18 @@
 #define _MAIN_TF_WINDOW_H
 
-#include "GL/glui.h"
+#include "glui.h"
 #include "ControlPoint.h"
 

trunk/gui/vizservers/nanovis/transfer-function/TransferFunctionMain.h

@@ -1 +1 @@
 #include "GL/glut.h"
-#include "GL/glui.h"
+#include "glui.h"
 
 #ifndef __TF_MAIN_H__